X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=f5afe1562af869a3d84197913e14667b9ce729c0;hb=909ca7b9ac11711478aaa5dd4ab17a0d1dabe075;hp=6cdd5910db50c96df3d149fba172750cb10c09cb;hpb=5590fe762ff9d68f6968d80979e446576e61e2e1;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 6cdd5910d..f5afe1562 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -305,7 +305,8 @@ split_patches () {
 		msgnum=
 		;;
 	*)
-		if test -n "$parse_patch" ; then
+		if test -n "$patch_format"
+		then
 			clean_abort "Patch format $patch_format is not supported."
 		else
 			clean_abort "Patch format detection failed."
@@ -507,6 +508,8 @@ else
 	fi
 fi
 
+git update-index -q --refresh
+
 case "$resolved" in
 '')
 	case "$HAS_HEAD" in