diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 14:00:46 +0100 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 13:03:39 +0000 |
commit | 9f01daa2dc229b0357f69e45e4961b4f3d534565 (patch) | |
tree | 56a99e735bf087e2db0601f9e1e7b29d51550550 /tools | |
parent | 830ad37ed6139c689468d36d03aa3a3de3f01299 (diff) |
Add check of whitespace error after Wireshark check (checkhf, checAPIs...)
(Because check whitespace quit after check... and no longer launch other check...)
Change-Id: I97ee0191c3d985934e74d23576f88984ec0e9b46
Reviewed-on: https://code.wireshark.org/review/739
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/pre-commit | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/pre-commit b/tools/pre-commit index 7cceb69a99..f9b41168d6 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -8,9 +8,6 @@ # http://mark-story.com/posts/view/using-git-commit-hooks-to-prevent-stupid-mistakes # -# If there are whitespace errors, print the offending file names and fail. (from git pre-commit.sample) -exec git diff-index --check --cached HEAD - # Check for newer versions of the pre-commit script if [ ./.git/hooks/pre-commit -ot ./tools/pre-commit ] ; then echo "Pre-commit hook script is outdated, please update!" @@ -33,6 +30,10 @@ for FILE in `git diff-index --cached --name-only HEAD | grep "\.[ch]$"` ; do ./tools/fix-encoding-args.pl $FILE done + +# If there are whitespace errors, print the offending file names and fail. (from git pre-commit.sample) +exec git diff-index --check --cached HEAD + exit # |