From: Junio C Hamano <junkio@cox.net>
Date: Wed, 2 Nov 2005 06:01:28 +0000 (-0800)
Subject: Do not put automatic merge message after signed-off-by line.
X-Git-Tag: v0.99.9c^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5215804ded0102f6d6f3d694374ae5e106fd9c0;p=git.git

Do not put automatic merge message after signed-off-by line.

'git-commit -s' after a failed automerge inserted the automerge
message in a wrong place.  The signed-off-by line should come
last.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-commit.sh b/git-commit.sh
index 10651d87d..daf90f1e5 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -129,6 +129,9 @@ then
 elif test "$use_commit" != ""
 then
 	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
+elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
+then
+	cat "$GIT_DIR/MERGE_MSG"
 fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
 
 case "$signoff" in
@@ -144,9 +147,6 @@ t)
 esac
 
 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
-
-	test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG"
-
 	echo "#"
 	echo "# It looks like your may be committing a MERGE."
 	echo "# If this is not correct, please remove the file"