X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=templates%2Fhooks--commit-msg;h=4ef86eb244bbbde9b793fd8cfab92042adb51485;hb=fae09a8084c9b51632726523b477a78dd28d7d7e;hp=643822d2351c4547895237992400bd92f492085b;hpb=b642d9ef643371990c0a921836f2a074d48ce1b3;p=git.git

diff --git a/templates/hooks--commit-msg b/templates/hooks--commit-msg
index 643822d23..4ef86eb24 100644
--- a/templates/hooks--commit-msg
+++ b/templates/hooks--commit-msg
@@ -8,7 +8,17 @@
 #
 # To enable this hook, make this file executable.
 
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# 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
+}