diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 22:01:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-01 22:01:28 -0800 |
| commit | e5215804ded0102f6d6f3d694374ae5e106fd9c0 (patch) | |
| tree | 9c030fed625268c19d7f0838b26f742745b36085 /git-commit.sh | |
| parent | 8e6ae4ad5ff14a6fd958ada867e24f8d248aac58 (diff) | |
| download | git-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.gz git-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.xz | |
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>
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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" |