kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pre-commit.sample: Diff against the empty tree when HEAD is invalid 

This was already the case for the old "diff --check" call, but the new
one that checks whether there are any non-ascii file names was missing
it, making that check fail for root commits.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Björn Steinbrink 2009-11-05 11:57:57 +01:00 committed by Junio C Hamano
parent 78d553b7d7
commit c30eb852e2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/hooks--pre-commit.sample
View File

@ -7,6 +7,14 @@
# #
# To enable this hook, rename this file to "pre-commit". # To enable this hook, rename this file to "pre-commit".


if git-rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi

# If you want to allow non-ascii filenames set this variable to true. # If you want to allow non-ascii filenames set this variable to true.
allownonascii=$(git config hooks.allownonascii) allownonascii=$(git config hooks.allownonascii)


@ -17,7 +25,7 @@ if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's # 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 # even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range. # the square bracket bytes happen to fall in the designated range.
test "$(git diff --cached --name-only --diff-filter=A -z | test "$(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0')" LC_ALL=C tr -d '[ -~]\0')"
then then
echo "Error: Attempt to add a non-ascii file name." echo "Error: Attempt to add a non-ascii file name."
@ -35,12 +43,4 @@ then
exit 1 exit 1
fi fi


if git-rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi

exec git diff-index --check --cached $against -- exec git diff-index --check --cached $against --