X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-merge.sh;h=7607e819c355fd30923c520b35ab4de7b918f013;hb=1ddea77e449ef28d8a7c74521af21121ab01abc0;hp=413bfcae9ffdf3d4545235e8000d8545e42e5384;hpb=a935824036dc2c5a8ef1980a4b05a12228712754;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 413bfcae..7607e819 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -19,7 +19,7 @@ default_strategies='resolve octopus'
 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
 }
 
@@ -28,9 +28,12 @@ savestate() {
 }
 
 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() {
@@ -160,6 +163,7 @@ case "$use_strategies" in
     single_strategy=no
     ;;
 *)
+    rm -f "$GIT_DIR/MERGE_SAVE"
     single_strategy=yes
     ;;
 esac
@@ -242,4 +246,6 @@ for remote
 do
 	echo $remote
 done >"$GIT_DIR/MERGE_HEAD"
+echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+
 die "Automatic merge failed; fix up by hand"