gitweb: Handle invalid regexp in regexp search

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index cf1f64b574b180332105d95295dfa35c8f6e10bb..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
@@ -577,13 +580,6 @@ then
        resume=
 fi
 
-if test "$this" -gt "$last"
-then
-       say Nothing to do.
-       rm -fr "$dotest"
-       exit
-fi
-
 while test "$this" -le "$last"
 do
        msgnum=`printf "%0${prec}d" $this`