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