mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
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>
This commit is contained in:
parent
8e6ae4ad5f
commit
e5215804de
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue