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