X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=872145b92dc7000eb1c87d548a46fa0d9522870d;hb=c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80;hp=eab4aa891e522539bb145c9702200d3a788e650c;hpb=4c61b7d15a6215fa4dffa33c37c3ef9df80d3f67;p=git.git

diff --git a/git-am.sh b/git-am.sh
index eab4aa89..872145b9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -376,6 +376,13 @@ do
 			echo "No changes - did you forget update-index?"
 			stop_here $this
 		fi
+		unmerged=$(git-ls-files -u)
+		if test -n "$unmerged"
+		then
+			echo "You still have unmerged paths in your index"
+			echo "did you forget update-index?"
+			stop_here $this
+		fi
 		apply_status=0
 		;;
 	esac