@matheusbsbs / matheus-bagliano / commits / 78443d9049
Fork 0

Migrate git-am.sh to use git-rev-parse --parseopt

Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Pierre Habouzit committed Nov 4, 2007 at 11:30 UTC 78443d90491c1b82afdffc3d5d2ab8c1a58928b5
1 file changed +49 -45
git-am.sh
+49 -45
@@ -2,11 +2,26 @@
2 #
3 # Copyright (c) 2005, 2006 Junio C Hamano
4
5 -USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
6 - [--3way] [--interactive] [--binary]
7 - [--whitespace=<option>] [-C<n>] [-p<n>]
8 - <mbox>|<Maildir>...
9 - or, when resuming [--skip | --resolved]'
5 +OPTIONS_KEEPDASHDASH=
6 +OPTIONS_SPEC="\
7 +git-am [options] <mbox>|<Maildir>...
8 +git-am [options] --resolved
9 +git-am [options] --skip
10 +--
11 +d,dotest= use <dir> and not .dotest
12 +i,interactive= run interactively
13 +b,binary pass --allo-binary-replacement to git-apply
14 +3,3way allow fall back on 3way merging if needed
15 +s,signoff add a Signed-off-by line to the commit message
16 +u,utf8 recode into utf8 (default)
17 +k,keep pass -k flagg to git-mailinfo
18 +whitespace= pass it through git-apply
19 +C= pass it through git-apply
20 +p= pass it through git-apply
21 +resolvemsg= override error message when patch failure occurs
22 +r,resolved to be used after a patch failure
23 +skip skip the current patch"
24 +
25 . git-sh-setup
26 set_reflog_action am
27 require_work_tree
@@ -110,49 +125,38 @@ git_apply_opt=
125 while test $# != 0
126 do
127 case "$1" in
113 - -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
114 - dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
115 - -d|--d|--do|--dot|--dote|--dotes|--dotest)
116 - case "$#" in 1) usage ;; esac; shift
117 - dotest="$1"; shift;;
118 -
119 - -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
120 - --interacti|--interactiv|--interactive)
121 - interactive=t; shift ;;
122 -
123 - -b|--b|--bi|--bin|--bina|--binar|--binary)
124 - binary=t; shift ;;
125 -
126 - -3|--3|--3w|--3wa|--3way)
127 - threeway=t; shift ;;
128 - -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
129 - sign=t; shift ;;
130 - -u|--u|--ut|--utf|--utf8)
131 - utf8=t; shift ;; # this is now default
132 - --no-u|--no-ut|--no-utf|--no-utf8)
133 - utf8=; shift ;;
134 - -k|--k|--ke|--kee|--keep)
135 - keep=t; shift ;;
136 -
137 - -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved)
138 - resolved=t; shift ;;
139 -
140 - --sk|--ski|--skip)
141 - skip=t; shift ;;
142 -
143 - --whitespace=*|-C*|-p*)
144 - git_apply_opt="$git_apply_opt $1"; shift ;;
145 -
146 - --resolvemsg=*)
147 - resolvemsg=${1#--resolvemsg=}; shift ;;
148 -
128 + -i|--interactive)
129 + interactive=t ;;
130 + -b|--binary)
131 + binary=t ;;
132 + -3|--3way)
133 + threeway=t ;;
134 + -s--signoff)
135 + sign=t ;;
136 + -u|--utf8)
137 + utf8=t ;; # this is now default
138 + --no-utf8)
139 + utf8= ;;
140 + -k|--keep)
141 + keep=t ;;
142 + -r|--resolved)
143 + resolved=t ;;
144 + --skip)
145 + skip=t ;;
146 + -d|--dotest)
147 + shift; dotest=$1;;
148 + --resolvemsg)
149 + shift; resolvemsg=$1 ;;
150 + --whitespace)
151 + git_apply_opt="$git_apply_opt $1=$2"; shift ;;
152 + -C|-p)
153 + git_apply_opt="$git_apply_opt $1$2"; shift ;;
154 --)
150 - shift; break ;;
151 - -*)
152 - usage ;;
155 + shift; break ;;
156 *)
154 - break ;;
157 + usage ;;
158 esac
159 + shift
160 done
161
162 # If the dotest directory exists, but we have finished applying all the