diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 13:03:55 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 13:07:21 -0700 |
commit | 6b7dd51e1210e962c83b1337c8fa59f1ab65c735 (patch) | |
tree | f8210b9afa45cf5d0ce56806be5bd5f4f7121b9c /build-aux | |
parent | d193f52f78ff3568ad1e98e5443864ff47b6cf3a (diff) | |
download | emacs-6b7dd51e1210e962c83b1337c8fa59f1ab65c735.tar.gz |
Fix 'commit-msg' to cite 'CONTRIBUTE'
As suggested in:
http://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00947.html
Also, have the two files match better.
* CONTRIBUTE: Match what's in build-aux/git-hooks/commit-msg.
* build-aux/git-hooks/commit-msg: Mention 'CONTRIBUTE'.
Diffstat (limited to 'build-aux')
-rwxr-xr-x | build-aux/git-hooks/commit-msg | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 31df5ce034a..13a05351ded 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -63,7 +63,7 @@ exec $awk ' /^#/ { next } !/^.*$/ { - print "Invalid character (not UTF-8) in commit message" + print "Invalid character (not UTF-8) in commit message; see 'CONTRIBUTE'" status = 1 } @@ -77,13 +77,13 @@ exec $awk ' sub(/^squash! /, "") if ($0 ~ "^" space) { - print "White space at start of commit message'\''s first line" + print "White space at start of commit message'\''s first line; see 'CONTRIBUTE'" status = 1 } } nlines == 2 && $0 ~ non_space { - print "Nonempty second line in commit message" + print "Nonempty second line in commit message; see 'CONTRIBUTE'" status = 1 } @@ -97,28 +97,28 @@ exec $awk ' } 78 < length && $0 ~ space { - print "Line longer than 78 characters in commit message" + print "Line longer than 78 characters in commit message; see 'CONTRIBUTE'" status = 1 } 140 < length { - print "Word longer than 140 characters in commit message" + print "Word longer than 140 characters in commit message; see 'CONTRIBUTE'" status = 1 } /^Signed-off-by: / { - print "'\''Signed-off-by:'\'' in commit message" + print "'\''Signed-off-by:'\'' in commit message; see 'CONTRIBUTE'" status = 1 } $0 ~ non_print { - print "Unprintable character in commit message" + print "Unprintable character in commit message; see 'CONTRIBUTE'" status = 1 } END { if (nlines == 0) { - print "Empty commit message" + print "Empty commit message; see 'CONTRIBUTE'" status = 1 } exit status |