Give default merge message after failed automerge.

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

diff --git a/git-commit.sh b/git-commit.sh
index d8bfc3c254929d3fb7a8aa702b4f4a86edefe8f0..9412840d8f2cc58b19d2ae3406396f2a271135d4 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -141,6 +141,9 @@ t)
 esac
 
 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
 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"
        echo "#"
        echo "# It looks like your may be committing a MERGE."
        echo "# If this is not correct, please remove the file"

diff --git a/git-merge.sh b/git-merge.sh
index 413bfcae9ffdf3d4545235e8000d8545e42e5384..7607e819c355fd30923c520b35ab4de7b918f013 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -19,7 +19,7 @@ default_strategies='resolve octopus'
 use_strategies=
 
 dropsave() {
 use_strategies=
 
 dropsave() {

-       rm -f -- "$GIT_DIR/MERGE_HEAD" \
+       rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \

                 "$GIT_DIR/MERGE_SAVE" || exit 1
 }
 
                 "$GIT_DIR/MERGE_SAVE" || exit 1
 }
 


@@ -28,9 +28,12 @@ savestate() {
 }
 
 restorestate() {
 }
 
 restorestate() {

-       git reset --hard $head
-       cpio -iuv <"$GIT_DIR/MERGE_SAVE"
-       git-update-index --refresh >/dev/null
+        if test -f "$GIT_DIR/MERGE_SAVE"
+       then
+               git reset --hard $head
+               cpio -iuv <"$GIT_DIR/MERGE_SAVE"
+               git-update-index --refresh >/dev/null
+       fi

 }
 
 summary() {
 }
 
 summary() {


@@ -160,6 +163,7 @@ case "$use_strategies" in
     single_strategy=no
     ;;
 *)
     single_strategy=no
     ;;
 *)

+    rm -f "$GIT_DIR/MERGE_SAVE"

     single_strategy=yes
     ;;
 esac
     single_strategy=yes
     ;;
 esac


@@ -242,4 +246,6 @@ for remote
 do
        echo $remote
 done >"$GIT_DIR/MERGE_HEAD"
 do
        echo $remote
 done >"$GIT_DIR/MERGE_HEAD"

+echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+

 die "Automatic merge failed; fix up by hand"
 die "Automatic merge failed; fix up by hand"