gitweb: Handle invalid regexp in regexp search

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index f4db17d93424c18c1db53e9bf84cdeee8219fa10..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."
@@ -467,12 +468,12 @@ else
                                set x
                                first=
                        }
-                       case "$arg" in
-                       /*)
-                               set "$@" "$arg" ;;
-                       *)
-                               set "$@" "$prefix$arg" ;;
-                       esac
+                       if is_absolute_path "$arg"
+                       then
+                               set "$@" "$arg"
+                       else
+                               set "$@" "$prefix$arg"
+                       fi
                done
                shift
        fi
@@ -507,6 +508,8 @@ else
        fi
 fi
 
+git update-index -q --refresh
+
 case "$resolved" in
 '')
        case "$HAS_HEAD" in