summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-02 06:01:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-02 06:01:28 (GMT)
commite5215804ded0102f6d6f3d694374ae5e106fd9c0 (patch)
tree9c030fed625268c19d7f0838b26f742745b36085 /git-commit.sh
parent8e6ae4ad5ff14a6fd958ada867e24f8d248aac58 (diff)
downloadgit-e5215804ded0102f6d6f3d694374ae5e106fd9c0.zip
git-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.gz
git-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.bz2
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-xgit-commit.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 10651d8..daf90f1 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"