From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Feb 2006 10:21:28 +0000 (-0800)
Subject: Merge fixes early for next maint series.
X-Git-Tag: v1.3.0-rc1~149
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/a68de9592e4565a2cf3e14b3bc9c9cd57d7306d5?hp=3efaa937a52aff14ca35207fd3a8a4d1d1ed2067

Merge fixes early for next maint series.
---

diff --git a/git-am.sh b/git-am.sh
index 85ecada657..7cc4ae5a30 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -300,7 +300,7 @@ do
 	    } >"$dotest/final-commit"
 	    ;;
 	*)
-		case "$resolved,$interactive" in
+		case "$resolved$interactive" in
 		tt)
 			# This is used only for interactive view option.
 			git-diff-index -p --cached HEAD >"$dotest/patch"
@@ -364,6 +364,12 @@ do
 		# trust what the user has in the index file and the
 		# working tree.
 		resolved=
+		changed="$(git-diff-index --cached --name-only HEAD)"
+		if test '' = "$changed"
+		then
+			echo "No changes - did you forget update-index?"
+			stop_here $this
+		fi
 		apply_status=0
 		;;
 	esac
@@ -374,7 +380,7 @@ do
 		then
 		    # 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)"
+		    changed="$(git-diff-index --cached --name-only HEAD)"
 		    if test '' = "$changed"
 		    then
 			    echo No changes -- Patch already applied.