path: root/templates
diff options
authorJim Meyering <>2011-10-22 17:44:40 (GMT)
committerJunio C Hamano <>2011-10-26 21:31:14 (GMT)
commitc14daa4845ff2ec0d27807fa50f9fac1ca4d6462 (patch)
tree5c20ec99da60e81b4ddfb085441433679e3800cb /templates
parentc4c42f2cbd2eb14871881cc0d27412b477f699a7 (diff)
make the sample pre-commit hook script reject names with newlines, too
The sample pre-commit hook script would fail to reject a file name like "a\nb" because of the way newlines are handled in "$(...)". Adjust the test to count filtered bytes and require there be 0. Also print all diagnostics to standard error, not stdout, so they will actually be seen. Signed-off-by: Jim Meyering <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'templates')
1 files changed, 6 insertions, 2 deletions
diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample
index b187c4b..18c4829 100755
--- a/templates/hooks--pre-commit.sample
+++ b/templates/hooks--pre-commit.sample
@@ -18,6 +18,9 @@ fi
# If you want to allow non-ascii filenames set this variable to true.
allownonascii=$(git config hooks.allownonascii)
+# Redirect output to stderr.
+exec 1>&2
# Cross platform projects tend to avoid non-ascii filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
@@ -25,8 +28,8 @@ if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
- test "$(git diff --cached --name-only --diff-filter=A -z $against |
- LC_ALL=C tr -d '[ -~]\0')"
+ test $(git diff --cached --name-only --diff-filter=A -z $against |
+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
echo "Error: Attempt to add a non-ascii file name."
@@ -43,4 +46,5 @@ then
exit 1
+# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --