diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:33 -0800 |
| commit | 2dfb96c9fc925ce2f9cd6bd347bc15c1edc368fe (patch) | |
| tree | 7c393d9bea4c6983240dbc87d5aa4a36c9046f06 | |
| parent | Merge branch 'js/maint-diff-color-words' (diff) | |
| parent | pre-commit.sample: Diff against the empty tree when HEAD is invalid (diff) | |
| download | tgif-2dfb96c9fc925ce2f9cd6bd347bc15c1edc368fe.tar.xz | |
Merge branch 'bs/maint-pre-commit-hook-sample'
* bs/maint-pre-commit-hook-sample:
pre-commit.sample: Diff against the empty tree when HEAD is invalid
| -rwxr-xr-x | templates/hooks--pre-commit.sample | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 043970a751..439eefda51 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -7,6 +7,14 @@ # # 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. 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 # 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 | + test "$(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0')" then echo "Error: Attempt to add a non-ascii file name." @@ -35,12 +43,4 @@ then exit 1 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 -- |