Skip to content

Commit c14daa4

Browse files
meyeringgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c4c42f2 commit c14daa4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

templates/hooks--pre-commit.sample

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ fi
1818
# If you want to allow non-ascii filenames set this variable to true.
1919
allownonascii=$(git config hooks.allownonascii)
2020

21+
# Redirect output to stderr.
22+
exec 1>&2
23+
2124
# Cross platform projects tend to avoid non-ascii filenames; prevent
2225
# them from being added to the repository. We exploit the fact that the
2326
# printable range starts at the space character and ends with tilde.
2427
if [ "$allownonascii" != "true" ] &&
2528
# Note that the use of brackets around a tr range is ok here, (it's
2629
# even required, for portability to Solaris 10's /usr/bin/tr), since
2730
# the square bracket bytes happen to fall in the designated range.
28-
test "$(git diff --cached --name-only --diff-filter=A -z $against |
29-
LC_ALL=C tr -d '[ -~]\0')"
31+
test $(git diff --cached --name-only --diff-filter=A -z $against |
32+
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
3033
then
3134
echo "Error: Attempt to add a non-ascii file name."
3235
echo
@@ -43,4 +46,5 @@ then
4346
exit 1
4447
fi
4548

49+
# If there are whitespace errors, print the offending file names and fail.
4650
exec git diff-index --check --cached $against --

0 commit comments

Comments
 (0)