procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port commit-message checking to FreeBSD 9.

Browse source 
This fixes a bug reported by Jan Djärv in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html
along with some other issues I noticed while testing with FreeBSD.
* build-aux/git-hooks/commit-msg: Prefer gawk if available.
Prefer en_US.UTF-8 to en_US.utf8, as it's more portable.
Work around bug in FreeBSD 9 awk, where /[[:cntrl:]]/ matches
ordinary text characters.
Be less tricky about quoting "'" in a shell script.
This commit is contained in:
Paul Eggert 2014-12-07 16:17:20 -08:00
parent 3db1adacc6
commit 0f9fbb922c
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2014-12-08 Paul Eggert <eggert@cs.ucla.edu>
Port commit-message checking to FreeBSD 9.
This fixes a bug reported by Jan Djärv in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html
along with some other issues I noticed while testing with FreeBSD.
* build-aux/git-hooks/commit-msg: Prefer gawk if available.
Prefer en_US.UTF-8 to en_US.utf8, as it's more portable.
Work around bug in FreeBSD 9 awk, where /[[:cntrl:]]/ matches
ordinary text characters.
Be less tricky about quoting "'" in a shell script.
2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca> 2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
* .gitignore: Ignore autosave files. * .gitignore: Ignore autosave files.

21
build-aux/git-hooks/commit-msg
View file

@ -20,25 +20,32 @@
# Written by Paul Eggert. # Written by Paul Eggert.
# Prefer gawk if available, as it handles NUL bytes properly.
if type gawk >/dev/null 2>&1; then
awk=gawk
else
awk=awk
fi
# Use a UTF-8 locale if available, so that the UTF-8 check works. # Use a UTF-8 locale if available, so that the UTF-8 check works.
# Use U+00A2 CENT SIGN to test whether the locale works. # Use U+00A2 CENT SIGN to test whether the locale works.
cent_sign_utf8_octal='\302\242' cent_sign_utf8_octal='\302\242'
at_sign=` at_sign=`
printf "${cent_sign_utf8_octal}@" | printf "${cent_sign_utf8_octal}@" |
awk '{print substr($0, 2)}' 2>/dev/null $awk '{print substr($0, 2)}' 2>/dev/null
` `
if test "$at_sign" != @; then if test "$at_sign" != @; then
at_sign=` at_sign=`
printf "${cent_sign_utf8_octal}@" | printf "${cent_sign_utf8_octal}@" |
LC_ALL=en_US.utf8 awk '{print substr($0, 2)}' 2>/dev/null LC_ALL=en_US.UTF-8 $awk '{print substr($0, 2)}' 2>/dev/null
` `
if test "$at_sign" = @; then if test "$at_sign" = @; then
LC_ALL=en_US.utf8; export LC_ALL LC_ALL=en_US.UTF-8; export LC_ALL
fi fi
fi fi
# Check the log entry. # Check the log entry.
exec awk ' exec $awk '
/^#/ { next } /^#/ { next }
!/^.*$/ { !/^.*$/ {
@ -60,8 +67,8 @@ exec awk '
status = 1 status = 1
} }
/[[:cntrl:]]/ { /[^[:print:]]/ {
print "Text contains control character; please use spaces instead of tabs" print "Unprintable character; please use spaces instead of tabs"
status = 1 status = 1
} }
@ -76,7 +83,7 @@ exec awk '
} }
/^Signed-off-by: / { /^Signed-off-by: / {
print "'Signed-off-by:' present" print "'\''Signed-off-by:'\'' present"
status = 1 status = 1
} }