X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=cb4bef5adb27e6f45b77656f29a86083f729350f;hb=5f93926c3c5c4fe1def39de82076bc69ec89c058;hp=9e41e7031339670f8077a9fd0ca98c703cc35ea6;hpb=0d0b7c237af0846123bef73879d65a3e78a56461;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 9e41e703..cb4bef5a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -35,10 +35,10 @@ fall_back_3way () {
     mkdir "$dotest/patch-merge-tmp-dir"
 
     # First see if the patch records the index info that we can use.
-    if git-apply --show-index-info "$dotest/patch" \
+    if git-apply -z --index-info "$dotest/patch" \
 	>"$dotest/patch-merge-index-info" 2>/dev/null &&
 	GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
-	git-update-index --index-info <"$dotest/patch-merge-index-info" &&
+	git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
 	GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
 	git-write-tree >"$dotest/patch-merge-base+" &&
 	# index has the base tree now.
@@ -172,7 +172,6 @@ else
 	echo "$sign" >"$dotest/sign"
 	echo "$utf8" >"$dotest/utf8"
 	echo "$keep" >"$dotest/keep"
-	echo "$threeway" >"$dotest/3way"
 	echo 1 >"$dotest/next"
 fi
 
@@ -193,7 +192,6 @@ then
 else
 	SIGNOFF=
 fi
-threeway=$(cat "$dotest/3way")
 
 last=`cat "$dotest/last"`
 this=`cat "$dotest/next"`
@@ -256,6 +254,8 @@ do
 
 	if test "$interactive" = t
 	then
+	    test -t 0 ||
+	    die "cannot be interactive without stdin connected to a terminal."
 	    action=again
 	    while test "$action" = again
 	    do
@@ -296,15 +296,19 @@ do
 	git-apply --index "$dotest/patch"; apply_status=$?
 	if test $apply_status = 1 && test "$threeway" = t
 	then
-		(fall_back_3way) || stop_here $this
-
-		# Applying the patch to an earlier tree and merging the
-		# result may have produced the same tree as ours.
-		if test '' = "$(git-diff-index --cached --name-only -z HEAD)"
+		if (fall_back_3way)
 		then
-			echo No changes -- Patch already applied.
-			go_next
-			continue
+		    # Applying the patch to an earlier tree and merging the
+		    # result may have produced the same tree as ours.
+		    changed="$(git-diff-index --cached --name-only -z HEAD)"
+		    if test '' = "$changed"
+		    then
+			    echo No changes -- Patch already applied.
+			    go_next
+			    continue
+		    fi
+		    # clear apply_status -- we have successfully merged.
+		    apply_status=0
 		fi
 	fi
 	if test $apply_status != 0