summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 21:13:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 21:13:07 (GMT)
commit75010153e95f2b340f841953e3a0ce269ccf394f (patch)
tree9cacddfcda16e9d34806bbc32f50749dc4ad5674 /templates
parent0ca2f3241aadd99265b3e864fe68dddffdeff84f (diff)
parent51f5a2b4394c741433f11d54aa3f0ac2c4a647b6 (diff)
downloadgit-75010153e95f2b340f841953e3a0ce269ccf394f.zip
git-75010153e95f2b340f841953e3a0ce269ccf394f.tar.gz
git-75010153e95f2b340f841953e3a0ce269ccf394f.tar.bz2
Merge branch 'ks/prepare-commit-msg-sample-fix'
An "oops" fix to a topic that is already in 'master'. * ks/prepare-commit-msg-sample-fix: hook: use correct logical variable
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/hooks--prepare-commit-msg.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/hooks--prepare-commit-msg.sample b/templates/hooks--prepare-commit-msg.sample
index dc707e4..318afe3 100755
--- a/templates/hooks--prepare-commit-msg.sample
+++ b/templates/hooks--prepare-commit-msg.sample
@@ -34,7 +34,7 @@ SHA1=$3
# *) ;;
# esac
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
# if test -z "$COMMIT_SOURCE"
# then