Jim Meyering wrote: ... > No problem. This has made me realize that the recent > scripts/git-hooks/commit-msg change that was suppose to prevent > these is not working. I thought it would make "git am FILE" > fail whenever there is a Signed-off-by: line, but it does not.
And here's the cause/fix: >From 4146ee681a06949c7cac700547f9808b3c1a2ac6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 31 Aug 2012 12:52:08 +0200 Subject: [PATCH] scripts: make the new Signed-off-by: hook actually work * scripts/git-hooks/commit-msg: Fix new test: we're searching a multi-line buffer, so add the //m modifier. --- scripts/git-hooks/commit-msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git-hooks/commit-msg b/scripts/git-hooks/commit-msg index f867331..56286d4 100755 --- a/scripts/git-hooks/commit-msg +++ b/scripts/git-hooks/commit-msg @@ -125,7 +125,7 @@ sub check_msg($$) $buf =~ m!https?://debbugs\.gnu\.org/(?:cgi/bugreport\.cgi\?bug=)?(\d+)!s and return "use shorter http://bugs.gnu.org/$1";; - $buf =~ /^ *Signed-off-by:/i + $buf =~ /^ *Signed-off-by:/mi and return q(do not use "Signed-off-by:"); return ''; -- 1.7.12.146.g16d26b1
