Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: >> It works well in all cases except when the user invokes >> "git commit" without any arguments. In that case manually >> add a new line after the first line to ensure it's consistent >> with the output of "-s" option. >> > > Again, s/signature/sign-off/g, or similar (including subject line). Thanks for being a careful reader. >> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> >> --- >> templates/hooks--prepare-commit-msg.sample | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/templates/hooks--prepare-commit-msg.sample b/templates/hooks--prepare-commit-msg.sample >> index 708f0e92c..a15d6d634 100755 >> --- a/templates/hooks--prepare-commit-msg.sample >> +++ b/templates/hooks--prepare-commit-msg.sample >> @@ -32,4 +32,8 @@ SHA1=$3 >> # esac >> >> # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') >> -# grep -qs "^$SOB" "$COMMIT_MSG_FILE" || echo "$SOB" >> "$COMMIT_MSG_FILE" >> +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" >> +# if test -z "$COMMIT_SOURCE" >> +# then >> +# @PERL_PATH@ -i.bak -pe 'print "\n" if($first_line++ == 0)' "$COMMIT_MSG_FILE" >> +# fi I think we should do print "\n" if !$first_line++ for brevity (and also avoid "if(" that lacks SP) here.