Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

diff --git a/git-am.sh b/git-am.sh
index 6cdd5910db50c96df3d149fba172750cb10c09cb..f5afe1562af869a3d84197913e14667b9ce729c0 100755 (executable)
--- 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