diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-13 09:36:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-13 13:44:23 +0100 |
| commit | 2e4ecd03d63268eec0f4045b126aa8cfdb75dee7 (patch) | |
| tree | 8cbc381fedcf1b8d426dd0f95e96474eb1e2387a /.git-hooks | |
| parent | 2f28d2b4fa92be7dca47ea48c1a68db7b2060608 (diff) | |
clang-format: ignore not staged hunks
09:28 <@sberg> vmiklos, I think I ran into a scenario last night where I had
both `git add`-ed and non-added changes in a non-blacklisted file, and the
non-added changes violated clang-format (and the added ones did not), and the
commit hook complained
So make sure we validate the index version, not the filesystem one.
(And modify a formatted file to trigger CI validation of the hook change
itself.)
Change-Id: I6431b35ac50dd03741104b5709c5195d6ff28632
Reviewed-on: https://gerrit.libreoffice.org/46368
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to '.git-hooks')
| -rwxr-xr-x | .git-hooks/pre-commit | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit index c0464e1c0778..e25532bb0662 100755 --- a/.git-hooks/pre-commit +++ b/.git-hooks/pre-commit @@ -161,8 +161,7 @@ sub check_style($) print("cp clang-format-$version-$platform clang-format\n"); print("chmod +x clang-format\n\n"); - print("(Or read the instructions how to build it yourself at\n"); - print("<https://dev-www.libreoffice.org/bin/README.clang-format.txt>).\n\n"); + print("(Or read solenv/clang-format/README on how to build it yourself.\n"); return; } if (!ClangFormat::check_style($clang_format, $filename)) |