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