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