diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:07 -0700 |
commit | dfb78f0388260d739cee87bc8054573ee5e6156b (patch) | |
tree | 78f2dacf1507f810a5d0ef696db34bccf3ab1ea6 | |
parent | 29143fc4e3e5236aa57a1f1ef63f775491159782 (diff) | |
parent | 7b3742fa466401574a2ff380d5d121b2ac5cea45 (diff) | |
download | git-dfb78f0388260d739cee87bc8054573ee5e6156b.tar.gz |
Merge branch 'rh/template-updates'
* rh/template-updates:
templates: spell ASCII in uppercase in pre-commit hook
templates: Reformat pre-commit hook's message
templates: Use heredoc in pre-commit hook
-rwxr-xr-x | templates/hooks--pre-commit.sample | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 18c4829765..586e3bf94d 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -15,13 +15,13 @@ else 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) # Redirect output to stderr. exec 1>&2 -# Cross platform projects tend to avoid non-ascii filenames; prevent +# 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. if [ "$allownonascii" != "true" ] && @@ -31,18 +31,17 @@ if [ "$allownonascii" != "true" ] && test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF exit 1 fi |