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>
Junio C Hamano committed
Nov 1, 2005 at 22:01 UTC
e5215804ded0102f6d6f3d694374ae5e106fd9c0
1 file changed
+3
-3
git-commit.sh
+3
-3
@@ -129,6 +129,9 @@ then
129
elif test "$use_commit" != ""
130
then
131
git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
132
+elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
133
+then
134
+ cat "$GIT_DIR/MERGE_MSG"
135
fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
136
137
case "$signoff" in
@@ -144,9 +147,6 @@ t)
147
esac
148
149
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
147
-
148
- test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG"
149
-
150
echo "#"
151
echo "# It looks like your may be committing a MERGE."
152
echo "# If this is not correct, please remove the file"