Merge branch 'jc/make'

[thirdparty/git.git] / templates / hooks--commit-msg

diff --git a/templates/hooks--commit-msg b/templates/hooks--commit-msg
index 643822d2351c4547895237992400bd92f492085b..9b04f2d69c6dc054e8e5403062fb7ef5d2117328 100644 (file)
--- a/templates/hooks--commit-msg
+++ b/templates/hooks--commit-msg
@@ -8,7 +8,15 @@
 #
 # 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
+}
+