X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-commit.sh;h=ec506d956fa2858897c53b35d28db8083b7fdcec;hb=d48744d1a80031003f9354a79131fca6bff6fa73;hp=85c278afabef75dd09386b1586c85c6c812bcd5a;hpb=e0d10e1c63bc52b37bbec99b07deee794058d9b4;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index 85c278afa..ec506d956 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -442,8 +442,11 @@ fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
 
 case "$signoff" in
 t)
+	need_blank_before_signoff=
+	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
+	grep 'Signed-off-by:' >/dev/null || need_blank_before_signoff=yes
 	{
-		echo
+		test -z "$need_blank_before_signoff" || echo
 		git-var GIT_COMMITTER_IDENT | sed -e '
 			s/>.*/>/
 			s/^/Signed-off-by: /
@@ -525,6 +528,7 @@ else
 	rloga='commit (initial)'
 	current=''
 fi
+set_reflog_action "$rloga"
 
 if test -z "$no_edit"
 then
@@ -599,7 +603,7 @@ then
 	fi &&
 	commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
 	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
-	git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
+	git-update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
 	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
 	if test -f "$NEXT_INDEX"
 	then