am: parse options in stuck-long mode
There is no functional change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Vigier committed
Feb 1, 2014 at 02:18 UTC
883366235f58baf3a225e19004116545ede2282e
1 file changed
+9
-9
git-am.sh
+9
-9
@@ -4,7 +4,7 @@
4
5
SUBDIRECTORY_OK=Yes
6
OPTIONS_KEEPDASHDASH=
7
-OPTIONS_STUCKLONG=
7
+OPTIONS_STUCKLONG=t
8
OPTIONS_SPEC="\
9
git am [options] [(<mbox>|<Maildir>)...]
10
git am [options] (--continue | --skip | --abort)
@@ -414,14 +414,14 @@ it will be removed. Please do not use it anymore."
414
abort=t ;;
415
--rebasing)
416
rebasing=t threeway=t ;;
417
- --resolvemsg)
418
- shift; resolvemsg=$1 ;;
419
- --whitespace|--directory|--exclude|--include)
420
- git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
421
- -C|-p)
422
- git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
423
- --patch-format)
424
- shift ; patch_format="$1" ;;
417
+ --resolvemsg=*)
418
+ resolvemsg="${1#--resolvemsg=}" ;;
419
+ --whitespace=*|--directory=*|--exclude=*|--include=*)
420
+ git_apply_opt="$git_apply_opt $(sq "$1")" ;;
421
+ -C*|-p*)
422
+ git_apply_opt="$git_apply_opt $(sq "$1")" ;;
423
+ --patch-format=*)
424
+ patch_format="${1#--patch-format=}" ;;
425
--reject|--ignore-whitespace|--ignore-space-change)
426
git_apply_opt="$git_apply_opt $1" ;;
427
--committer-date-is-author-date)