X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2Fhooks--commit-msg;h=c5cdb9d7eeebab7edf048e77eb92437de24751bf;hb=e076a0e71f25430205d0437c177fd12a7018e5ad;hp=029f897c4ccdd8479f5636b965dd709720c652bf;hpb=51017101c7a308745ba3c04944457f1dc6a55780;p=git.git

diff --git a/templates/hooks--commit-msg b/templates/hooks--commit-msg
index 029f897c4..c5cdb9d7e 100644
--- a/templates/hooks--commit-msg
+++ b/templates/hooks--commit-msg
@@ -1,14 +1,21 @@
 #!/bin/sh
 #
 # An example hook script to check the commit log message.
-# Called by git-commit-script with one argument, the name of the file
+# Called by git-commit with one argument, the name of the file
 # that has the commit message.  The hook should exit with non-zero
 # status after issuing an appropriate message if it wants to stop the
 # commit.  The hook is allowed to edit the commit message file.
 #
 # To enable this hook, make this file executable.
 
+# Uncomment the below to add a Signed-off-by line to the message.
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
 # This example catches duplicate Signed-off-by lines.
 
 test "" = "$(grep '^Signed-off-by: ' "$1" |
-	 sort | uniq -c | sed -e '/^[ 	]*1 /d')"
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}