From 27b6e17a6d84a18861f05fd7c684ab443bf15244 Mon Sep 17 00:00:00 2001 From: Richard Hartmann Date: Sun, 14 Jul 2013 18:21:14 +0200 Subject: [PATCH 1/3] templates: Use heredoc in pre-commit hook This way, it is easier to see how the text we give the end users would look like, and it will allow us to use (near) full width of the source file. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit.sample | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 18c4829765..5558caa7bb 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -31,18 +31,19 @@ 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 From b1d5a570fc0176c77a52896e3b59174baa95e8bf Mon Sep 17 00:00:00 2001 From: Richard Hartmann Date: Sun, 14 Jul 2013 18:21:15 +0200 Subject: [PATCH 2/3] templates: Reformat pre-commit hook's message Now that we're using heredoc, the message can span the full 80 chars. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit.sample | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 5558caa7bb..2d867021d0 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -34,13 +34,11 @@ then 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. +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: +If you know what you are doing you can disable this check using: git config hooks.allownonascii true EOF From 7b3742fa466401574a2ff380d5d121b2ac5cea45 Mon Sep 17 00:00:00 2001 From: Richard Hartmann Date: Sun, 14 Jul 2013 18:21:16 +0200 Subject: [PATCH 3/3] templates: spell ASCII in uppercase in pre-commit hook The name of the encoding is ASCII, not ascii. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 2d867021d0..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" ] && @@ -32,7 +32,7 @@ if [ "$allownonascii" != "true" ] && LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then cat <<\EOF -Error: Attempt to add a non-ascii file name. +Error: Attempt to add a non-ASCII file name. This can cause problems if you want to work with people on other platforms.