X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-am.sh;h=df09b42840b7675e135605f9108894ce93e6d477;hb=a7b60f00557002a37b1ea2e1922ac6ffbfc61fef;hp=5f249485df230bed0d2a620104369260b0ac8b66;hpb=69ae92bda13dfbf0b7d169c57b9f2715af2a9d67;p=git.git diff --git a/git-am.sh b/git-am.sh index 5f249485d..df09b4284 100755 --- a/git-am.sh +++ b/git-am.sh @@ -5,7 +5,7 @@ SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git am [options] [|...] +git am [options] [(|)...] git am [options] (--resolved | --skip | --abort) -- i,interactive run interactively @@ -444,12 +444,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