]>
Commit | Line | Data |
---|---|---|
d1c5f2a4 JH |
1 | #!/bin/sh |
2 | # | |
d64e6b04 | 3 | # Copyright (c) 2005, 2006 Junio C Hamano |
d1c5f2a4 | 4 | |
c1491841 | 5 | SUBDIRECTORY_OK=Yes |
78443d90 PH |
6 | OPTIONS_KEEPDASHDASH= |
7 | OPTIONS_SPEC="\ | |
0adda936 | 8 | git am [options] [(<mbox>|<Maildir>)...] |
09f8d055 | 9 | git am [options] (--resolved | --skip | --abort) |
78443d90 | 10 | -- |
66006c63 | 11 | i,interactive run interactively |
98ef23b3 | 12 | b,binary* (historical option -- no-op) |
78443d90 | 13 | 3,3way allow fall back on 3way merging if needed |
0e987a12 | 14 | q,quiet be quiet |
78443d90 PH |
15 | s,signoff add a Signed-off-by line to the commit message |
16 | u,utf8 recode into utf8 (default) | |
fe1fa946 | 17 | k,keep pass -k flag to git-mailinfo |
ad2c9280 | 18 | keep-cr pass --keep-cr flag to git-mailsplit for mbox format |
e80d4cbe | 19 | no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr |
017678b4 | 20 | c,scissors strip everything before a scissors line |
78443d90 | 21 | whitespace= pass it through git-apply |
86c91f91 GB |
22 | ignore-space-change pass it through git-apply |
23 | ignore-whitespace pass it through git-apply | |
b47dfe9e | 24 | directory= pass it through git-apply |
77e9e496 | 25 | exclude= pass it through git-apply |
78443d90 PH |
26 | C= pass it through git-apply |
27 | p= pass it through git-apply | |
a5a6755a | 28 | patch-format= format the patch(es) are in |
b80da424 | 29 | reject pass it through git-apply |
78443d90 | 30 | resolvemsg= override error message when patch failure occurs |
c8089af6 JK |
31 | continue continue applying patches after resolving a conflict |
32 | r,resolved synonyms for --continue | |
3041c324 | 33 | skip skip the current patch |
3e5057a8 | 34 | abort restore the original branch and abort the patching operation. |
3f01ad66 | 35 | committer-date-is-author-date lie about committer date |
a79ec62d | 36 | ignore-date use current timestamp for author date |
cb6020bb | 37 | rerere-autoupdate update the index with reused conflict resolution if possible |
98ef23b3 | 38 | rebasing* (internal use for git-rebase)" |
78443d90 | 39 | |
cf1fe88c | 40 | . git-sh-setup |
b9a97269 | 41 | . git-sh-i18n |
bb034f83 | 42 | prefix=$(git rev-parse --show-prefix) |
f9474132 | 43 | set_reflog_action am |
7eff28a9 | 44 | require_work_tree |
c1491841 | 45 | cd_to_toplevel |
d1c5f2a4 | 46 | |
460abee5 | 47 | git var GIT_COMMITTER_IDENT >/dev/null || |
79087259 | 48 | die "$(gettext "You need to set your committer info first")" |
d64e6b04 | 49 | |
f79d4c8a NS |
50 | if git rev-parse --verify -q HEAD >/dev/null |
51 | then | |
52 | HAS_HEAD=yes | |
53 | else | |
54 | HAS_HEAD= | |
55 | fi | |
56 | ||
d2c46310 RR |
57 | cmdline="git am" |
58 | if test '' != "$interactive" | |
59 | then | |
60 | cmdline="$cmdline -i" | |
61 | fi | |
62 | if test '' != "$threeway" | |
63 | then | |
64 | cmdline="$cmdline -3" | |
65 | fi | |
66 | ||
b47dfe9e | 67 | sq () { |
47c9739e | 68 | git rev-parse --sq-quote "$@" |
b47dfe9e JH |
69 | } |
70 | ||
d1c5f2a4 JH |
71 | stop_here () { |
72 | echo "$1" >"$dotest/next" | |
7b3b7e37 | 73 | git rev-parse --verify -q HEAD >"$dotest/abort-safety" |
d1c5f2a4 JH |
74 | exit 1 |
75 | } | |
76 | ||
7b3b7e37 JH |
77 | safe_to_abort () { |
78 | if test -f "$dotest/dirtyindex" | |
79 | then | |
80 | return 1 | |
81 | fi | |
82 | ||
83 | if ! test -s "$dotest/abort-safety" | |
84 | then | |
85 | return 0 | |
86 | fi | |
87 | ||
88 | abort_safety=$(cat "$dotest/abort-safety") | |
89 | if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety" | |
90 | then | |
91 | return 0 | |
92 | fi | |
de88c1ce JS |
93 | gettextln "You seem to have moved HEAD since the last 'am' failure. |
94 | Not rewinding to ORIG_HEAD" >&2 | |
7b3b7e37 JH |
95 | return 1 |
96 | } | |
97 | ||
ced9456a | 98 | stop_here_user_resolve () { |
cc120056 | 99 | if [ -n "$resolvemsg" ]; then |
a23bfaed | 100 | printf '%s\n' "$resolvemsg" |
cc120056 SE |
101 | stop_here $1 |
102 | fi | |
de88c1ce | 103 | eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\". |
a4372c37 | 104 | If you would prefer to skip this patch, instead run \"\$cmdline --skip\". |
de88c1ce | 105 | To restore the original branch and stop patching run \"\$cmdline --abort\"." |
ced9456a RS |
106 | |
107 | stop_here $1 | |
108 | } | |
109 | ||
d1c5f2a4 JH |
110 | go_next () { |
111 | rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \ | |
112 | "$dotest/patch" "$dotest/info" | |
113 | echo "$next" >"$dotest/next" | |
114 | this=$next | |
115 | } | |
116 | ||
fd7bcfb5 JH |
117 | cannot_fallback () { |
118 | echo "$1" | |
de88c1ce | 119 | gettextln "Cannot fall back to three-way merge." |
fd7bcfb5 JH |
120 | exit 1 |
121 | } | |
122 | ||
d1c5f2a4 JH |
123 | fall_back_3way () { |
124 | O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` | |
125 | ||
126 | rm -fr "$dotest"/patch-merge-* | |
127 | mkdir "$dotest/patch-merge-tmp-dir" | |
128 | ||
129 | # First see if the patch records the index info that we can use. | |
7a988699 JS |
130 | git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \ |
131 | "$dotest/patch" && | |
fd7bcfb5 | 132 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |
5be60078 | 133 | git write-tree >"$dotest/patch-merge-base+" || |
a424ca15 | 134 | cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")" |
fd7bcfb5 | 135 | |
0e987a12 | 136 | say Using index info to reconstruct a base tree... |
fd7bcfb5 | 137 | if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |
cb3a160d | 138 | git apply --cached <"$dotest/patch" |
d1c5f2a4 | 139 | then |
d1c5f2a4 JH |
140 | mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" |
141 | mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" | |
fd7bcfb5 | 142 | else |
a424ca15 ÆAB |
143 | cannot_fallback "$(gettext "Did you hand edit your patch? |
144 | It does not apply to blobs recorded in its index.")" | |
d1c5f2a4 JH |
145 | fi |
146 | ||
147 | test -f "$dotest/patch-merge-index" && | |
5be60078 | 148 | his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) && |
d1c5f2a4 JH |
149 | orig_tree=$(cat "$dotest/patch-merge-base") && |
150 | rm -fr "$dotest"/patch-merge-* || exit 1 | |
151 | ||
865207a6 | 152 | say "$(gettext "Falling back to patching base and 3-way merge...")" |
d1c5f2a4 JH |
153 | |
154 | # This is not so wrong. Depending on which base we picked, | |
155 | # orig_tree may be wildly different from ours, but his_tree | |
156 | # has the same set of wildly different changes in parts the | |
579c9bb1 | 157 | # patch did not touch, so recursive ends up canceling them, |
d1c5f2a4 JH |
158 | # saying that we reverted all those changes. |
159 | ||
2e6e3e82 | 160 | eval GITHEAD_$his_tree='"$FIRSTLINE"' |
579c9bb1 | 161 | export GITHEAD_$his_tree |
0e987a12 SB |
162 | if test -n "$GIT_QUIET" |
163 | then | |
69ae92bd | 164 | GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY |
0e987a12 | 165 | fi |
579c9bb1 | 166 | git-merge-recursive $orig_tree -- HEAD $his_tree || { |
cb6020bb | 167 | git rerere $allow_rerere_autoupdate |
d1c5f2a4 JH |
168 | echo Failed to merge in the changes. |
169 | exit 1 | |
170 | } | |
579c9bb1 | 171 | unset GITHEAD_$his_tree |
d1c5f2a4 JH |
172 | } |
173 | ||
0cd29a03 GB |
174 | clean_abort () { |
175 | test $# = 0 || echo >&2 "$@" | |
176 | rm -fr "$dotest" | |
177 | exit 1 | |
178 | } | |
179 | ||
a5a6755a GB |
180 | patch_format= |
181 | ||
182 | check_patch_format () { | |
183 | # early return if patch_format was set from the command line | |
184 | if test -n "$patch_format" | |
185 | then | |
186 | return 0 | |
187 | fi | |
15ced753 GB |
188 | |
189 | # we default to mbox format if input is from stdin and for | |
190 | # directories | |
191 | if test $# = 0 || test "x$1" = "x-" || test -d "$1" | |
192 | then | |
193 | patch_format=mbox | |
194 | return 0 | |
195 | fi | |
196 | ||
0e8341f2 DB |
197 | # otherwise, check the first few non-blank lines of the first |
198 | # patch to try to detect its format | |
15ced753 | 199 | { |
0e8341f2 DB |
200 | # Start from first line containing non-whitespace |
201 | l1= | |
202 | while test -z "$l1" | |
203 | do | |
204 | read l1 | |
205 | done | |
15ced753 GB |
206 | read l2 |
207 | read l3 | |
208 | case "$l1" in | |
209 | "From "* | "From: "*) | |
210 | patch_format=mbox | |
211 | ;; | |
212 | '# This series applies on GIT commit'*) | |
213 | patch_format=stgit-series | |
214 | ;; | |
215 | "# HG changeset patch") | |
216 | patch_format=hg | |
217 | ;; | |
218 | *) | |
219 | # if the second line is empty and the third is | |
220 | # a From, Author or Date entry, this is very | |
221 | # likely an StGIT patch | |
222 | case "$l2,$l3" in | |
223 | ,"From: "* | ,"Author: "* | ,"Date: "*) | |
224 | patch_format=stgit | |
225 | ;; | |
226 | *) | |
227 | ;; | |
228 | esac | |
229 | ;; | |
230 | esac | |
0fcb2caf JH |
231 | if test -z "$patch_format" && |
232 | test -n "$l1" && | |
233 | test -n "$l2" && | |
234 | test -n "$l3" | |
235 | then | |
236 | # This begins with three non-empty lines. Is this a | |
237 | # piece of e-mail a-la RFC2822? Grab all the headers, | |
238 | # discarding the indented remainder of folded lines, | |
239 | # and see if it looks like that they all begin with the | |
240 | # header field names... | |
e3f67d30 SB |
241 | tr -d '\015' <"$1" | |
242 | sed -n -e '/^$/q' -e '/^[ ]/d' -e p | | |
e1622bfc | 243 | sane_egrep -v '^[!-9;-~]+:' >/dev/null || |
0fcb2caf JH |
244 | patch_format=mbox |
245 | fi | |
0cd29a03 | 246 | } < "$1" || clean_abort |
a5a6755a GB |
247 | } |
248 | ||
249 | split_patches () { | |
250 | case "$patch_format" in | |
251 | mbox) | |
e80d4cbe | 252 | if test -n "$rebasing" || test t = "$keepcr" |
ad2c9280 SH |
253 | then |
254 | keep_cr=--keep-cr | |
255 | else | |
256 | keep_cr= | |
257 | fi | |
c2ca1d79 | 258 | git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" || |
0cd29a03 | 259 | clean_abort |
a5a6755a | 260 | ;; |
c574e683 GB |
261 | stgit-series) |
262 | if test $# -ne 1 | |
263 | then | |
d62a1461 | 264 | clean_abort "$(gettext "Only one StGIT patch series can be applied at once")" |
c574e683 GB |
265 | fi |
266 | series_dir=`dirname "$1"` | |
267 | series_file="$1" | |
268 | shift | |
269 | { | |
270 | set x | |
271 | while read filename | |
272 | do | |
273 | set "$@" "$series_dir/$filename" | |
274 | done | |
275 | # remove the safety x | |
276 | shift | |
277 | # remove the arg coming from the first-line comment | |
278 | shift | |
0cd29a03 | 279 | } < "$series_file" || clean_abort |
c574e683 GB |
280 | # set the patch format appropriately |
281 | patch_format=stgit | |
282 | # now handle the actual StGIT patches | |
283 | split_patches "$@" | |
284 | ;; | |
285 | stgit) | |
286 | this=0 | |
287 | for stgit in "$@" | |
288 | do | |
289 | this=`expr "$this" + 1` | |
290 | msgnum=`printf "%0${prec}d" $this` | |
291 | # Perl version of StGIT parse_patch. The first nonemptyline | |
292 | # not starting with Author, From or Date is the | |
293 | # subject, and the body starts with the next nonempty | |
294 | # line not starting with Author, From or Date | |
295 | perl -ne 'BEGIN { $subject = 0 } | |
296 | if ($subject > 1) { print ; } | |
297 | elsif (/^\s+$/) { next ; } | |
298 | elsif (/^Author:/) { print s/Author/From/ ; } | |
299 | elsif (/^(From|Date)/) { print ; } | |
300 | elsif ($subject) { | |
301 | $subject = 2 ; | |
302 | print "\n" ; | |
303 | print ; | |
304 | } else { | |
305 | print "Subject: ", $_ ; | |
306 | $subject = 1; | |
307 | } | |
0cd29a03 | 308 | ' < "$stgit" > "$dotest/$msgnum" || clean_abort |
c574e683 GB |
309 | done |
310 | echo "$this" > "$dotest/last" | |
311 | this= | |
312 | msgnum= | |
313 | ;; | |
a5a6755a | 314 | *) |
46caf505 | 315 | if test -n "$parse_patch" ; then |
d62a1461 | 316 | clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")" |
46caf505 | 317 | else |
d62a1461 | 318 | clean_abort "$(gettext "Patch format detection failed.")" |
46caf505 | 319 | fi |
a5a6755a GB |
320 | ;; |
321 | esac | |
322 | } | |
323 | ||
d1c5f2a4 | 324 | prec=4 |
51ef1daa | 325 | dotest="$GIT_DIR/rebase-apply" |
ad2c9280 | 326 | sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort= |
d25e5159 | 327 | resolvemsg= resume= scissors= no_inbody_headers= |
67dad687 | 328 | git_apply_opt= |
3f01ad66 | 329 | committer_date_is_author_date= |
a79ec62d | 330 | ignore_date= |
cb6020bb | 331 | allow_rerere_autoupdate= |
d1c5f2a4 | 332 | |
e80d4cbe SH |
333 | if test "$(git config --bool --get am.keepcr)" = true |
334 | then | |
335 | keepcr=t | |
336 | fi | |
337 | ||
822f7c73 | 338 | while test $# != 0 |
d1c5f2a4 JH |
339 | do |
340 | case "$1" in | |
78443d90 PH |
341 | -i|--interactive) |
342 | interactive=t ;; | |
343 | -b|--binary) | |
cb3a160d | 344 | : ;; |
78443d90 PH |
345 | -3|--3way) |
346 | threeway=t ;; | |
dfdd7e66 | 347 | -s|--signoff) |
78443d90 PH |
348 | sign=t ;; |
349 | -u|--utf8) | |
350 | utf8=t ;; # this is now default | |
351 | --no-utf8) | |
352 | utf8= ;; | |
353 | -k|--keep) | |
354 | keep=t ;; | |
017678b4 JH |
355 | -c|--scissors) |
356 | scissors=t ;; | |
357 | --no-scissors) | |
358 | scissors=f ;; | |
c8089af6 | 359 | -r|--resolved|--continue) |
78443d90 PH |
360 | resolved=t ;; |
361 | --skip) | |
362 | skip=t ;; | |
3e5057a8 NS |
363 | --abort) |
364 | abort=t ;; | |
3041c324 | 365 | --rebasing) |
d25e5159 | 366 | rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;; |
78443d90 | 367 | -d|--dotest) |
79087259 | 368 | die "$(gettext "-d option is no longer supported. Do not use.")" |
e72c7406 | 369 | ;; |
78443d90 PH |
370 | --resolvemsg) |
371 | shift; resolvemsg=$1 ;; | |
77e9e496 | 372 | --whitespace|--directory|--exclude) |
b47dfe9e | 373 | git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; |
78443d90 | 374 | -C|-p) |
b47dfe9e | 375 | git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; |
a5a6755a GB |
376 | --patch-format) |
377 | shift ; patch_format="$1" ;; | |
86c91f91 | 378 | --reject|--ignore-whitespace|--ignore-space-change) |
b80da424 | 379 | git_apply_opt="$git_apply_opt $1" ;; |
3f01ad66 JH |
380 | --committer-date-is-author-date) |
381 | committer_date_is_author_date=t ;; | |
a79ec62d NS |
382 | --ignore-date) |
383 | ignore_date=t ;; | |
cb6020bb JH |
384 | --rerere-autoupdate|--no-rerere-autoupdate) |
385 | allow_rerere_autoupdate="$1" ;; | |
0e987a12 SB |
386 | -q|--quiet) |
387 | GIT_QUIET=t ;; | |
ad2c9280 SH |
388 | --keep-cr) |
389 | keepcr=t ;; | |
e80d4cbe SH |
390 | --no-keep-cr) |
391 | keepcr=f ;; | |
d1c5f2a4 | 392 | --) |
78443d90 | 393 | shift; break ;; |
d1c5f2a4 | 394 | *) |
78443d90 | 395 | usage ;; |
d1c5f2a4 | 396 | esac |
78443d90 | 397 | shift |
d1c5f2a4 JH |
398 | done |
399 | ||
0c15cc92 JH |
400 | # If the dotest directory exists, but we have finished applying all the |
401 | # patches in them, clear it out. | |
d1c5f2a4 JH |
402 | if test -d "$dotest" && |
403 | last=$(cat "$dotest/last") && | |
404 | next=$(cat "$dotest/next") && | |
405 | test $# != 0 && | |
406 | test "$next" -gt "$last" | |
407 | then | |
408 | rm -fr "$dotest" | |
409 | fi | |
410 | ||
411 | if test -d "$dotest" | |
412 | then | |
3e5057a8 | 413 | case "$#,$skip$resolved$abort" in |
c95b1389 JH |
414 | 0,*t*) |
415 | # Explicit resume command and we do not have file, so | |
416 | # we are happy. | |
417 | : ;; | |
418 | 0,) | |
419 | # No file input but without resume parameters; catch | |
420 | # user error to feed us a patch from standard input | |
e72c7406 | 421 | # when there is already $dotest. This is somewhat |
c95b1389 JH |
422 | # unreliable -- stdin could be /dev/null for example |
423 | # and the caller did not intend to feed us a patch but | |
424 | # wanted to continue unattended. | |
98ef23b3 | 425 | test -t 0 |
c95b1389 JH |
426 | ;; |
427 | *) | |
428 | false | |
429 | ;; | |
430 | esac || | |
79087259 | 431 | die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")" |
271440e3 | 432 | resume=yes |
3e5057a8 | 433 | |
95f8ebbf | 434 | case "$skip,$abort" in |
2d56a136 | 435 | t,t) |
79087259 | 436 | die "$(gettext "Please make up your mind. --skip or --abort?")" |
2d56a136 | 437 | ;; |
95f8ebbf OM |
438 | t,) |
439 | git rerere clear | |
440 | git read-tree --reset -u HEAD HEAD | |
441 | orig_head=$(cat "$GIT_DIR/ORIG_HEAD") | |
442 | git reset HEAD | |
443 | git update-ref ORIG_HEAD $orig_head | |
444 | ;; | |
445 | ,t) | |
2d56a136 JH |
446 | if test -f "$dotest/rebasing" |
447 | then | |
448 | exec git rebase --abort | |
449 | fi | |
3e5057a8 | 450 | git rerere clear |
7b3b7e37 JH |
451 | if safe_to_abort |
452 | then | |
c767184d MG |
453 | git read-tree --reset -u HEAD ORIG_HEAD |
454 | git reset ORIG_HEAD | |
7b3b7e37 | 455 | fi |
3e5057a8 NS |
456 | rm -fr "$dotest" |
457 | exit ;; | |
458 | esac | |
c767184d | 459 | rm -f "$dotest/dirtyindex" |
d1c5f2a4 | 460 | else |
3e5057a8 NS |
461 | # Make sure we are not given --skip, --resolved, nor --abort |
462 | test "$skip$resolved$abort" = "" || | |
79087259 | 463 | die "$(gettext "Resolve operation not in progress, we are not resuming.")" |
d1c5f2a4 JH |
464 | |
465 | # Start afresh. | |
466 | mkdir -p "$dotest" || exit | |
467 | ||
bb034f83 JH |
468 | if test -n "$prefix" && test $# != 0 |
469 | then | |
470 | first=t | |
471 | for arg | |
472 | do | |
473 | test -n "$first" && { | |
474 | set x | |
475 | first= | |
476 | } | |
5e9677cb PT |
477 | if is_absolute_path "$arg" |
478 | then | |
479 | set "$@" "$arg" | |
480 | else | |
481 | set "$@" "$prefix$arg" | |
482 | fi | |
bb034f83 JH |
483 | done |
484 | shift | |
485 | fi | |
a5a6755a GB |
486 | |
487 | check_patch_format "$@" | |
488 | ||
489 | split_patches "$@" | |
d1c5f2a4 | 490 | |
017678b4 JH |
491 | # -i can and must be given when resuming; everything |
492 | # else is kept | |
9b9f5a22 | 493 | echo " $git_apply_opt" >"$dotest/apply-opt" |
22db240d | 494 | echo "$threeway" >"$dotest/threeway" |
d1c5f2a4 JH |
495 | echo "$sign" >"$dotest/sign" |
496 | echo "$utf8" >"$dotest/utf8" | |
497 | echo "$keep" >"$dotest/keep" | |
ad2c9280 | 498 | echo "$keepcr" >"$dotest/keepcr" |
017678b4 | 499 | echo "$scissors" >"$dotest/scissors" |
d25e5159 | 500 | echo "$no_inbody_headers" >"$dotest/no_inbody_headers" |
0e987a12 | 501 | echo "$GIT_QUIET" >"$dotest/quiet" |
d1c5f2a4 | 502 | echo 1 >"$dotest/next" |
3041c324 JH |
503 | if test -n "$rebasing" |
504 | then | |
505 | : >"$dotest/rebasing" | |
506 | else | |
507 | : >"$dotest/applying" | |
f79d4c8a NS |
508 | if test -n "$HAS_HEAD" |
509 | then | |
510 | git update-ref ORIG_HEAD HEAD | |
511 | else | |
512 | git update-ref -d ORIG_HEAD >/dev/null 2>&1 | |
513 | fi | |
3041c324 | 514 | fi |
d1c5f2a4 JH |
515 | fi |
516 | ||
2a6f08ac JK |
517 | git update-index -q --refresh |
518 | ||
0c15cc92 JH |
519 | case "$resolved" in |
520 | '') | |
f79d4c8a NS |
521 | case "$HAS_HEAD" in |
522 | '') | |
523 | files=$(git ls-files) ;; | |
524 | ?*) | |
525 | files=$(git diff-index --cached --name-only HEAD --) ;; | |
526 | esac || exit | |
c767184d MG |
527 | if test "$files" |
528 | then | |
f79d4c8a | 529 | test -n "$HAS_HEAD" && : >"$dotest/dirtyindex" |
79087259 | 530 | die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")" |
c767184d | 531 | fi |
0c15cc92 JH |
532 | esac |
533 | ||
d1c5f2a4 JH |
534 | if test "$(cat "$dotest/utf8")" = t |
535 | then | |
536 | utf8=-u | |
bb1091a4 JH |
537 | else |
538 | utf8=-n | |
d1c5f2a4 JH |
539 | fi |
540 | if test "$(cat "$dotest/keep")" = t | |
541 | then | |
542 | keep=-k | |
543 | fi | |
e80d4cbe SH |
544 | case "$(cat "$dotest/keepcr")" in |
545 | t) | |
546 | keepcr=--keep-cr ;; | |
547 | f) | |
548 | keepcr=--no-keep-cr ;; | |
549 | esac | |
017678b4 JH |
550 | case "$(cat "$dotest/scissors")" in |
551 | t) | |
552 | scissors=--scissors ;; | |
553 | f) | |
554 | scissors=--no-scissors ;; | |
555 | esac | |
d25e5159 LS |
556 | if test "$(cat "$dotest/no_inbody_headers")" = t |
557 | then | |
558 | no_inbody_headers=--no-inbody-headers | |
559 | else | |
560 | no_inbody_headers= | |
561 | fi | |
0e987a12 SB |
562 | if test "$(cat "$dotest/quiet")" = t |
563 | then | |
564 | GIT_QUIET=t | |
565 | fi | |
22db240d JH |
566 | if test "$(cat "$dotest/threeway")" = t |
567 | then | |
568 | threeway=t | |
569 | fi | |
9b9f5a22 | 570 | git_apply_opt=$(cat "$dotest/apply-opt") |
d1c5f2a4 JH |
571 | if test "$(cat "$dotest/sign")" = t |
572 | then | |
5354a56f | 573 | SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e ' |
d1c5f2a4 JH |
574 | s/>.*/>/ |
575 | s/^/Signed-off-by: /' | |
576 | ` | |
577 | else | |
578 | SIGNOFF= | |
579 | fi | |
d1c5f2a4 JH |
580 | |
581 | last=`cat "$dotest/last"` | |
582 | this=`cat "$dotest/next"` | |
583 | if test "$skip" = t | |
584 | then | |
585 | this=`expr "$this" + 1` | |
69224716 | 586 | resume= |
d1c5f2a4 JH |
587 | fi |
588 | ||
d1c5f2a4 JH |
589 | while test "$this" -le "$last" |
590 | do | |
591 | msgnum=`printf "%0${prec}d" $this` | |
592 | next=`expr "$this" + 1` | |
593 | test -f "$dotest/$msgnum" || { | |
69224716 | 594 | resume= |
d1c5f2a4 JH |
595 | go_next |
596 | continue | |
597 | } | |
0c15cc92 JH |
598 | |
599 | # If we are not resuming, parse and extract the patch information | |
600 | # into separate files: | |
601 | # - info records the authorship and title | |
602 | # - msg is the rest of commit log message | |
603 | # - patch is the patch body. | |
604 | # | |
605 | # When we are resuming, these files are either already prepared | |
606 | # by the user, or the user can tell us to do so by --resolved flag. | |
271440e3 JH |
607 | case "$resume" in |
608 | '') | |
d25e5159 | 609 | git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \ |
271440e3 JH |
610 | <"$dotest/$msgnum" >"$dotest/info" || |
611 | stop_here $this | |
ca193cf1 JS |
612 | |
613 | # skip pine's internal folder data | |
e1622bfc | 614 | sane_grep '^Author: Mail System Internal Data$' \ |
ca193cf1 JS |
615 | <"$dotest"/info >/dev/null && |
616 | go_next && continue | |
617 | ||
28ed6e7b | 618 | test -s "$dotest/patch" || { |
de88c1ce | 619 | eval_gettextln "Patch is empty. Was it split wrong? |
a4372c37 | 620 | If you would prefer to skip this patch, instead run \"\$cmdline --skip\". |
de88c1ce | 621 | To restore the original branch and stop patching run \"\$cmdline --abort\"." |
87ab7992 DZ |
622 | stop_here $this |
623 | } | |
43c23251 | 624 | rm -f "$dotest/original-commit" "$dotest/author-script" |
5e835cac JH |
625 | if test -f "$dotest/rebasing" && |
626 | commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \ | |
627 | -e q "$dotest/$msgnum") && | |
628 | test "$(git cat-file -t "$commit")" = commit | |
629 | then | |
630 | git cat-file commit "$commit" | | |
631 | sed -e '1,/^$/d' >"$dotest/msg-clean" | |
96e19488 | 632 | echo "$commit" > "$dotest/original-commit" |
43c23251 | 633 | get_author_ident_from_commit "$commit" > "$dotest/author-script" |
5e835cac | 634 | else |
c970a6fd JH |
635 | { |
636 | sed -n '/^Subject/ s/Subject: //p' "$dotest/info" | |
637 | echo | |
638 | cat "$dotest/msg" | |
639 | } | | |
640 | git stripspace > "$dotest/msg-clean" | |
5e835cac | 641 | fi |
271440e3 JH |
642 | ;; |
643 | esac | |
d1c5f2a4 | 644 | |
43c23251 JS |
645 | if test -f "$dotest/author-script" |
646 | then | |
647 | eval $(cat "$dotest/author-script") | |
648 | else | |
649 | GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" | |
650 | GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" | |
651 | GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" | |
652 | fi | |
e0e3ba20 | 653 | |
3b78959e | 654 | if test -z "$GIT_AUTHOR_EMAIL" |
e0e3ba20 | 655 | then |
de88c1ce | 656 | gettextln "Patch does not have a valid e-mail address." |
e0e3ba20 JH |
657 | stop_here $this |
658 | fi | |
659 | ||
2c674191 | 660 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
d1c5f2a4 | 661 | |
4bfb6b62 JH |
662 | case "$resume" in |
663 | '') | |
664 | if test '' != "$SIGNOFF" | |
665 | then | |
d1c5f2a4 | 666 | LAST_SIGNED_OFF_BY=` |
4bfb6b62 JH |
667 | sed -ne '/^Signed-off-by: /p' \ |
668 | "$dotest/msg-clean" | | |
b4ce54fc | 669 | sed -ne '$p' |
d1c5f2a4 | 670 | ` |
4bfb6b62 JH |
671 | ADD_SIGNOFF=` |
672 | test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { | |
d1c5f2a4 JH |
673 | test '' = "$LAST_SIGNED_OFF_BY" && echo |
674 | echo "$SIGNOFF" | |
4bfb6b62 JH |
675 | }` |
676 | else | |
d1c5f2a4 | 677 | ADD_SIGNOFF= |
4bfb6b62 JH |
678 | fi |
679 | { | |
d1c5f2a4 JH |
680 | if test -s "$dotest/msg-clean" |
681 | then | |
d1c5f2a4 JH |
682 | cat "$dotest/msg-clean" |
683 | fi | |
684 | if test '' != "$ADD_SIGNOFF" | |
685 | then | |
686 | echo "$ADD_SIGNOFF" | |
687 | fi | |
4bfb6b62 JH |
688 | } >"$dotest/final-commit" |
689 | ;; | |
0c15cc92 | 690 | *) |
6d28644d | 691 | case "$resolved$interactive" in |
0c15cc92 JH |
692 | tt) |
693 | # This is used only for interactive view option. | |
38762c47 | 694 | git diff-index -p --cached HEAD -- >"$dotest/patch" |
0c15cc92 JH |
695 | ;; |
696 | esac | |
4bfb6b62 | 697 | esac |
d1c5f2a4 | 698 | |
4bfb6b62 | 699 | resume= |
d1c5f2a4 JH |
700 | if test "$interactive" = t |
701 | then | |
a1451104 | 702 | test -t 0 || |
79087259 | 703 | die "$(gettext "cannot be interactive without stdin connected to a terminal.")" |
d1c5f2a4 JH |
704 | action=again |
705 | while test "$action" = again | |
706 | do | |
de88c1ce | 707 | gettextln "Commit Body is:" |
d1c5f2a4 JH |
708 | echo "--------------------------" |
709 | cat "$dotest/final-commit" | |
710 | echo "--------------------------" | |
7a74d04a ÆAB |
711 | # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
712 | # in your translation. The program will only accept English | |
713 | # input at this point. | |
714 | gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
d1c5f2a4 JH |
715 | read reply |
716 | case "$reply" in | |
f89ad67f JH |
717 | [yY]*) action=yes ;; |
718 | [aA]*) action=yes interactive= ;; | |
719 | [nN]*) action=skip ;; | |
ef0c2abf | 720 | [eE]*) git_editor "$dotest/final-commit" |
d1c5f2a4 | 721 | action=again ;; |
f89ad67f | 722 | [vV]*) action=again |
f6dff119 | 723 | git_pager "$dotest/patch" ;; |
f89ad67f | 724 | *) action=again ;; |
d1c5f2a4 JH |
725 | esac |
726 | done | |
727 | else | |
728 | action=yes | |
729 | fi | |
92f65e6a RR |
730 | |
731 | if test -f "$dotest/final-commit" | |
732 | then | |
733 | FIRSTLINE=$(sed 1q "$dotest/final-commit") | |
734 | else | |
735 | FIRSTLINE="" | |
736 | fi | |
d1c5f2a4 JH |
737 | |
738 | if test $action = skip | |
739 | then | |
740 | go_next | |
741 | continue | |
742 | fi | |
743 | ||
744 | if test -x "$GIT_DIR"/hooks/applypatch-msg | |
745 | then | |
746 | "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || | |
747 | stop_here $this | |
748 | fi | |
749 | ||
dff1a983 | 750 | say "$(eval_gettext "Applying: \$FIRSTLINE")" |
d1c5f2a4 | 751 | |
0c15cc92 JH |
752 | case "$resolved" in |
753 | '') | |
3ddd1703 SB |
754 | # When we are allowed to fall back to 3-way later, don't give |
755 | # false errors during the initial attempt. | |
756 | squelch= | |
757 | if test "$threeway" = t | |
758 | then | |
759 | squelch='>/dev/null 2>&1 ' | |
760 | fi | |
761 | eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"' | |
0c15cc92 JH |
762 | apply_status=$? |
763 | ;; | |
764 | t) | |
765 | # Resolved means the user did all the hard work, and | |
766 | # we do not have to do any patch application. Just | |
767 | # trust what the user has in the index file and the | |
768 | # working tree. | |
769 | resolved= | |
38762c47 | 770 | git diff-index --quiet --cached HEAD -- && { |
de88c1ce | 771 | gettextln "No changes - did you forget to use 'git add'? |
bd8643ae | 772 | If there is nothing left to stage, chances are that something else |
de88c1ce | 773 | already introduced the same changes; you might want to skip this patch." |
ced9456a | 774 | stop_here_user_resolve $this |
06aff47b | 775 | } |
5be60078 | 776 | unmerged=$(git ls-files -u) |
c1d1128b JH |
777 | if test -n "$unmerged" |
778 | then | |
de88c1ce JS |
779 | gettextln "You still have unmerged paths in your index |
780 | did you forget to use 'git add'?" | |
ced9456a | 781 | stop_here_user_resolve $this |
c1d1128b | 782 | fi |
0c15cc92 | 783 | apply_status=0 |
b4372ef1 | 784 | git rerere |
0c15cc92 JH |
785 | ;; |
786 | esac | |
787 | ||
0ba17dd0 | 788 | if test $apply_status != 0 && test "$threeway" = t |
d1c5f2a4 | 789 | then |
73319032 | 790 | if (fall_back_3way) |
d1c5f2a4 | 791 | then |
73319032 JH |
792 | # Applying the patch to an earlier tree and merging the |
793 | # result may have produced the same tree as ours. | |
38762c47 | 794 | git diff-index --quiet --cached HEAD -- && { |
dff1a983 | 795 | say "$(gettext "No changes -- Patch already applied.")" |
06aff47b AR |
796 | go_next |
797 | continue | |
798 | } | |
73319032 JH |
799 | # clear apply_status -- we have successfully merged. |
800 | apply_status=0 | |
d1c5f2a4 JH |
801 | fi |
802 | fi | |
803 | if test $apply_status != 0 | |
804 | then | |
de88c1ce | 805 | eval_gettextln 'Patch failed at $msgnum $FIRSTLINE' |
ced9456a | 806 | stop_here_user_resolve $this |
d1c5f2a4 JH |
807 | fi |
808 | ||
809 | if test -x "$GIT_DIR"/hooks/pre-applypatch | |
810 | then | |
811 | "$GIT_DIR"/hooks/pre-applypatch || stop_here $this | |
812 | fi | |
813 | ||
5be60078 | 814 | tree=$(git write-tree) && |
3f01ad66 | 815 | commit=$( |
a79ec62d NS |
816 | if test -n "$ignore_date" |
817 | then | |
818 | GIT_AUTHOR_DATE= | |
819 | fi | |
f79d4c8a | 820 | parent=$(git rev-parse --verify -q HEAD) || |
dff1a983 | 821 | say >&2 "$(gettext "applying to an empty history")" |
f79d4c8a | 822 | |
3f01ad66 JH |
823 | if test -n "$committer_date_is_author_date" |
824 | then | |
825 | GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" | |
826 | export GIT_COMMITTER_DATE | |
827 | fi && | |
ea10b60c | 828 | git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit" |
3f01ad66 | 829 | ) && |
2e6e3e82 | 830 | git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent || |
d1c5f2a4 JH |
831 | stop_here $this |
832 | ||
96e19488 TR |
833 | if test -f "$dotest/original-commit"; then |
834 | echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten" | |
835 | fi | |
836 | ||
d1c5f2a4 JH |
837 | if test -x "$GIT_DIR"/hooks/post-applypatch |
838 | then | |
839 | "$GIT_DIR"/hooks/post-applypatch | |
840 | fi | |
841 | ||
842 | go_next | |
843 | done | |
844 | ||
eb2151bb TR |
845 | if test -s "$dotest"/rewritten; then |
846 | git notes copy --for-rewrite=rebase < "$dotest"/rewritten | |
847 | if test -x "$GIT_DIR"/hooks/post-rewrite; then | |
96e19488 | 848 | "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten |
eb2151bb | 849 | fi |
96e19488 TR |
850 | fi |
851 | ||
d1c5f2a4 | 852 | rm -fr "$dotest" |
29b67543 | 853 | git gc --auto |