MSVC: fix poll-related macro redefines
[git/dscho.git] / git-am.sh
blobef7191e562b9c04480b3299b59756caec5f423d5
1 #!/bin/sh
3 # Copyright (c) 2005, 2006 Junio C Hamano
5 SUBDIRECTORY_OK=Yes
6 OPTIONS_KEEPDASHDASH=
7 OPTIONS_SPEC="\
8 git am [options] [(<mbox>|<Maildir>)...]
9 git am [options] (--resolved | --skip | --abort)
11 i,interactive run interactively
12 b,binary* (historical option -- no-op)
13 3,3way allow fall back on 3way merging if needed
14 q,quiet be quiet
15 s,signoff add a Signed-off-by line to the commit message
16 u,utf8 recode into utf8 (default)
17 k,keep pass -k flag to git-mailinfo
18 keep-non-patch pass -b flag to git-mailinfo
19 keep-cr pass --keep-cr flag to git-mailsplit for mbox format
20 no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
21 c,scissors strip everything before a scissors line
22 whitespace= pass it through git-apply
23 ignore-space-change pass it through git-apply
24 ignore-whitespace pass it through git-apply
25 directory= pass it through git-apply
26 exclude= pass it through git-apply
27 C= pass it through git-apply
28 p= pass it through git-apply
29 patch-format= format the patch(es) are in
30 reject pass it through git-apply
31 resolvemsg= override error message when patch failure occurs
32 continue continue applying patches after resolving a conflict
33 r,resolved synonyms for --continue
34 skip skip the current patch
35 abort restore the original branch and abort the patching operation.
36 committer-date-is-author-date lie about committer date
37 ignore-date use current timestamp for author date
38 rerere-autoupdate update the index with reused conflict resolution if possible
39 rebasing* (internal use for git-rebase)"
41 . git-sh-setup
42 . git-sh-i18n
43 prefix=$(git rev-parse --show-prefix)
44 set_reflog_action am
45 require_work_tree
46 cd_to_toplevel
48 git var GIT_COMMITTER_IDENT >/dev/null ||
49 die "$(gettext "You need to set your committer info first")"
51 if git rev-parse --verify -q HEAD >/dev/null
52 then
53 HAS_HEAD=yes
54 else
55 HAS_HEAD=
58 cmdline="git am"
59 if test '' != "$interactive"
60 then
61 cmdline="$cmdline -i"
63 if test '' != "$threeway"
64 then
65 cmdline="$cmdline -3"
68 sq () {
69 git rev-parse --sq-quote "$@"
72 stop_here () {
73 echo "$1" >"$dotest/next"
74 git rev-parse --verify -q HEAD >"$dotest/abort-safety"
75 exit 1
78 safe_to_abort () {
79 if test -f "$dotest/dirtyindex"
80 then
81 return 1
84 if ! test -s "$dotest/abort-safety"
85 then
86 return 0
89 abort_safety=$(cat "$dotest/abort-safety")
90 if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
91 then
92 return 0
94 gettextln "You seem to have moved HEAD since the last 'am' failure.
95 Not rewinding to ORIG_HEAD" >&2
96 return 1
99 stop_here_user_resolve () {
100 if [ -n "$resolvemsg" ]; then
101 printf '%s\n' "$resolvemsg"
102 stop_here $1
104 eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
105 If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
106 To restore the original branch and stop patching run \"\$cmdline --abort\"."
108 stop_here $1
111 go_next () {
112 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
113 "$dotest/patch" "$dotest/info"
114 echo "$next" >"$dotest/next"
115 this=$next
118 cannot_fallback () {
119 echo "$1"
120 gettextln "Cannot fall back to three-way merge."
121 exit 1
124 fall_back_3way () {
125 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
127 rm -fr "$dotest"/patch-merge-*
128 mkdir "$dotest/patch-merge-tmp-dir"
130 # First see if the patch records the index info that we can use.
131 cmd="git apply $git_apply_opt --build-fake-ancestor" &&
132 cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
133 eval "$cmd" &&
134 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
135 git write-tree >"$dotest/patch-merge-base+" ||
136 cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
138 say Using index info to reconstruct a base tree...
140 cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
141 cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
142 if eval "$cmd"
143 then
144 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
145 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
146 else
147 cannot_fallback "$(gettext "Did you hand edit your patch?
148 It does not apply to blobs recorded in its index.")"
151 test -f "$dotest/patch-merge-index" &&
152 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
153 orig_tree=$(cat "$dotest/patch-merge-base") &&
154 rm -fr "$dotest"/patch-merge-* || exit 1
156 say "$(gettext "Falling back to patching base and 3-way merge...")"
158 # This is not so wrong. Depending on which base we picked,
159 # orig_tree may be wildly different from ours, but his_tree
160 # has the same set of wildly different changes in parts the
161 # patch did not touch, so recursive ends up canceling them,
162 # saying that we reverted all those changes.
164 eval GITHEAD_$his_tree='"$FIRSTLINE"'
165 export GITHEAD_$his_tree
166 if test -n "$GIT_QUIET"
167 then
168 GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
170 git-merge-recursive $orig_tree -- HEAD $his_tree || {
171 git rerere $allow_rerere_autoupdate
172 echo Failed to merge in the changes.
173 exit 1
175 unset GITHEAD_$his_tree
178 clean_abort () {
179 test $# = 0 || echo >&2 "$@"
180 rm -fr "$dotest"
181 exit 1
184 patch_format=
186 check_patch_format () {
187 # early return if patch_format was set from the command line
188 if test -n "$patch_format"
189 then
190 return 0
193 # we default to mbox format if input is from stdin and for
194 # directories
195 if test $# = 0 || test "x$1" = "x-" || test -d "$1"
196 then
197 patch_format=mbox
198 return 0
201 # otherwise, check the first few non-blank lines of the first
202 # patch to try to detect its format
204 # Start from first line containing non-whitespace
206 while test -z "$l1"
208 read l1 || break
209 done
210 read l2
211 read l3
212 case "$l1" in
213 "From "* | "From: "*)
214 patch_format=mbox
216 '# This series applies on GIT commit'*)
217 patch_format=stgit-series
219 "# HG changeset patch")
220 patch_format=hg
223 # if the second line is empty and the third is
224 # a From, Author or Date entry, this is very
225 # likely an StGIT patch
226 case "$l2,$l3" in
227 ,"From: "* | ,"Author: "* | ,"Date: "*)
228 patch_format=stgit
232 esac
234 esac
235 if test -z "$patch_format" &&
236 test -n "$l1" &&
237 test -n "$l2" &&
238 test -n "$l3"
239 then
240 # This begins with three non-empty lines. Is this a
241 # piece of e-mail a-la RFC2822? Grab all the headers,
242 # discarding the indented remainder of folded lines,
243 # and see if it looks like that they all begin with the
244 # header field names...
245 tr -d '\015' <"$1" |
246 sed -n -e '/^$/q' -e '/^[ ]/d' -e p |
247 sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
248 patch_format=mbox
250 } < "$1" || clean_abort
253 split_patches () {
254 case "$patch_format" in
255 mbox)
256 if test -n "$rebasing" || test t = "$keepcr"
257 then
258 keep_cr=--keep-cr
259 else
260 keep_cr=
262 git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
263 clean_abort
265 stgit-series)
266 if test $# -ne 1
267 then
268 clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
270 series_dir=`dirname "$1"`
271 series_file="$1"
272 shift
274 set x
275 while read filename
277 set "$@" "$series_dir/$filename"
278 done
279 # remove the safety x
280 shift
281 # remove the arg coming from the first-line comment
282 shift
283 } < "$series_file" || clean_abort
284 # set the patch format appropriately
285 patch_format=stgit
286 # now handle the actual StGIT patches
287 split_patches "$@"
289 stgit)
290 this=0
291 for stgit in "$@"
293 this=`expr "$this" + 1`
294 msgnum=`printf "%0${prec}d" $this`
295 # Perl version of StGIT parse_patch. The first nonemptyline
296 # not starting with Author, From or Date is the
297 # subject, and the body starts with the next nonempty
298 # line not starting with Author, From or Date
299 perl -ne 'BEGIN { $subject = 0 }
300 if ($subject > 1) { print ; }
301 elsif (/^\s+$/) { next ; }
302 elsif (/^Author:/) { s/Author/From/ ; print ;}
303 elsif (/^(From|Date)/) { print ; }
304 elsif ($subject) {
305 $subject = 2 ;
306 print "\n" ;
307 print ;
308 } else {
309 print "Subject: ", $_ ;
310 $subject = 1;
312 ' < "$stgit" > "$dotest/$msgnum" || clean_abort
313 done
314 echo "$this" > "$dotest/last"
315 this=
316 msgnum=
319 this=0
320 for hg in "$@"
322 this=$(( $this + 1 ))
323 msgnum=$(printf "%0${prec}d" $this)
324 # hg stores changeset metadata in #-commented lines preceding
325 # the commit message and diff(s). The only metadata we care about
326 # are the User and Date (Node ID and Parent are hashes which are
327 # only relevant to the hg repository and thus not useful to us)
328 # Since we cannot guarantee that the commit message is in
329 # git-friendly format, we put no Subject: line and just consume
330 # all of the message as the body
331 perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
332 if ($subject) { print ; }
333 elsif (/^\# User /) { s/\# User/From:/ ; print ; }
334 elsif (/^\# Date /) {
335 my ($hashsign, $str, $time, $tz) = split ;
336 $tz = sprintf "%+05d", (0-$tz)/36;
337 print "Date: " .
338 strftime("%a, %d %b %Y %H:%M:%S ",
339 localtime($time))
340 . "$tz\n";
341 } elsif (/^\# /) { next ; }
342 else {
343 print "\n", $_ ;
344 $subject = 1;
346 ' <"$hg" >"$dotest/$msgnum" || clean_abort
347 done
348 echo "$this" >"$dotest/last"
349 this=
350 msgnum=
353 if test -n "$patch_format"
354 then
355 clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
356 else
357 clean_abort "$(gettext "Patch format detection failed.")"
360 esac
363 prec=4
364 dotest="$GIT_DIR/rebase-apply"
365 sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
366 resolvemsg= resume= scissors= no_inbody_headers=
367 git_apply_opt=
368 committer_date_is_author_date=
369 ignore_date=
370 allow_rerere_autoupdate=
372 if test "$(git config --bool --get am.keepcr)" = true
373 then
374 keepcr=t
377 while test $# != 0
379 case "$1" in
380 -i|--interactive)
381 interactive=t ;;
382 -b|--binary)
383 echo >&2 "The $1 option has been a no-op for long time, and"
384 echo >&2 "it will be removed. Please do not use it anymore."
386 -3|--3way)
387 threeway=t ;;
388 -s|--signoff)
389 sign=t ;;
390 -u|--utf8)
391 utf8=t ;; # this is now default
392 --no-utf8)
393 utf8= ;;
394 -k|--keep)
395 keep=t ;;
396 --keep-non-patch)
397 keep=b ;;
398 -c|--scissors)
399 scissors=t ;;
400 --no-scissors)
401 scissors=f ;;
402 -r|--resolved|--continue)
403 resolved=t ;;
404 --skip)
405 skip=t ;;
406 --abort)
407 abort=t ;;
408 --rebasing)
409 rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
410 -d|--dotest)
411 die "$(gettext "-d option is no longer supported. Do not use.")"
413 --resolvemsg)
414 shift; resolvemsg=$1 ;;
415 --whitespace|--directory|--exclude)
416 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
417 -C|-p)
418 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
419 --patch-format)
420 shift ; patch_format="$1" ;;
421 --reject|--ignore-whitespace|--ignore-space-change)
422 git_apply_opt="$git_apply_opt $1" ;;
423 --committer-date-is-author-date)
424 committer_date_is_author_date=t ;;
425 --ignore-date)
426 ignore_date=t ;;
427 --rerere-autoupdate|--no-rerere-autoupdate)
428 allow_rerere_autoupdate="$1" ;;
429 -q|--quiet)
430 GIT_QUIET=t ;;
431 --keep-cr)
432 keepcr=t ;;
433 --no-keep-cr)
434 keepcr=f ;;
436 shift; break ;;
438 usage ;;
439 esac
440 shift
441 done
443 # If the dotest directory exists, but we have finished applying all the
444 # patches in them, clear it out.
445 if test -d "$dotest" &&
446 last=$(cat "$dotest/last") &&
447 next=$(cat "$dotest/next") &&
448 test $# != 0 &&
449 test "$next" -gt "$last"
450 then
451 rm -fr "$dotest"
454 if test -d "$dotest"
455 then
456 case "$#,$skip$resolved$abort" in
457 0,*t*)
458 # Explicit resume command and we do not have file, so
459 # we are happy.
460 : ;;
462 # No file input but without resume parameters; catch
463 # user error to feed us a patch from standard input
464 # when there is already $dotest. This is somewhat
465 # unreliable -- stdin could be /dev/null for example
466 # and the caller did not intend to feed us a patch but
467 # wanted to continue unattended.
468 test -t 0
471 false
473 esac ||
474 die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
475 resume=yes
477 case "$skip,$abort" in
478 t,t)
479 die "$(gettext "Please make up your mind. --skip or --abort?")"
482 git rerere clear
483 git read-tree --reset -u HEAD HEAD
484 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
485 git reset HEAD
486 git update-ref ORIG_HEAD $orig_head
489 if test -f "$dotest/rebasing"
490 then
491 exec git rebase --abort
493 git rerere clear
494 if safe_to_abort
495 then
496 git read-tree --reset -u HEAD ORIG_HEAD
497 git reset ORIG_HEAD
499 rm -fr "$dotest"
500 exit ;;
501 esac
502 rm -f "$dotest/dirtyindex"
503 else
504 # Make sure we are not given --skip, --resolved, nor --abort
505 test "$skip$resolved$abort" = "" ||
506 die "$(gettext "Resolve operation not in progress, we are not resuming.")"
508 # Start afresh.
509 mkdir -p "$dotest" || exit
511 if test -n "$prefix" && test $# != 0
512 then
513 first=t
514 for arg
516 test -n "$first" && {
517 set x
518 first=
520 if is_absolute_path "$arg"
521 then
522 set "$@" "$arg"
523 else
524 set "$@" "$prefix$arg"
526 done
527 shift
530 check_patch_format "$@"
532 split_patches "$@"
534 # -i can and must be given when resuming; everything
535 # else is kept
536 echo " $git_apply_opt" >"$dotest/apply-opt"
537 echo "$threeway" >"$dotest/threeway"
538 echo "$sign" >"$dotest/sign"
539 echo "$utf8" >"$dotest/utf8"
540 echo "$keep" >"$dotest/keep"
541 echo "$scissors" >"$dotest/scissors"
542 echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
543 echo "$GIT_QUIET" >"$dotest/quiet"
544 echo 1 >"$dotest/next"
545 if test -n "$rebasing"
546 then
547 : >"$dotest/rebasing"
548 else
549 : >"$dotest/applying"
550 if test -n "$HAS_HEAD"
551 then
552 git update-ref ORIG_HEAD HEAD
553 else
554 git update-ref -d ORIG_HEAD >/dev/null 2>&1
559 git update-index -q --refresh
561 case "$resolved" in
563 case "$HAS_HEAD" in
565 files=$(git ls-files) ;;
567 files=$(git diff-index --ignore-submodules --cached \
568 --name-only HEAD --) ;;
569 esac || exit
570 if test "$files"
571 then
572 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
573 die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
575 esac
577 # Now, decide what command line options we will give to the git
578 # commands we invoke, based on the result of parsing command line
579 # options and previous invocation state stored in $dotest/ files.
581 if test "$(cat "$dotest/utf8")" = t
582 then
583 utf8=-u
584 else
585 utf8=-n
587 keep=$(cat "$dotest/keep")
588 case "$keep" in
590 keep=-k ;;
592 keep=-b ;;
594 keep= ;;
595 esac
596 case "$(cat "$dotest/scissors")" in
598 scissors=--scissors ;;
600 scissors=--no-scissors ;;
601 esac
602 if test "$(cat "$dotest/no_inbody_headers")" = t
603 then
604 no_inbody_headers=--no-inbody-headers
605 else
606 no_inbody_headers=
608 if test "$(cat "$dotest/quiet")" = t
609 then
610 GIT_QUIET=t
612 if test "$(cat "$dotest/threeway")" = t
613 then
614 threeway=t
616 git_apply_opt=$(cat "$dotest/apply-opt")
617 if test "$(cat "$dotest/sign")" = t
618 then
619 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
620 s/>.*/>/
621 s/^/Signed-off-by: /'
623 else
624 SIGNOFF=
627 last=`cat "$dotest/last"`
628 this=`cat "$dotest/next"`
629 if test "$skip" = t
630 then
631 this=`expr "$this" + 1`
632 resume=
635 while test "$this" -le "$last"
637 msgnum=`printf "%0${prec}d" $this`
638 next=`expr "$this" + 1`
639 test -f "$dotest/$msgnum" || {
640 resume=
641 go_next
642 continue
645 # If we are not resuming, parse and extract the patch information
646 # into separate files:
647 # - info records the authorship and title
648 # - msg is the rest of commit log message
649 # - patch is the patch body.
651 # When we are resuming, these files are either already prepared
652 # by the user, or the user can tell us to do so by --resolved flag.
653 case "$resume" in
655 git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
656 <"$dotest/$msgnum" >"$dotest/info" ||
657 stop_here $this
659 # skip pine's internal folder data
660 sane_grep '^Author: Mail System Internal Data$' \
661 <"$dotest"/info >/dev/null &&
662 go_next && continue
664 test -s "$dotest/patch" || {
665 eval_gettextln "Patch is empty. Was it split wrong?
666 If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
667 To restore the original branch and stop patching run \"\$cmdline --abort\"."
668 stop_here $this
670 rm -f "$dotest/original-commit" "$dotest/author-script"
671 if test -f "$dotest/rebasing" &&
672 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
673 -e q "$dotest/$msgnum") &&
674 test "$(git cat-file -t "$commit")" = commit
675 then
676 git cat-file commit "$commit" |
677 sed -e '1,/^$/d' >"$dotest/msg-clean"
678 echo "$commit" > "$dotest/original-commit"
679 get_author_ident_from_commit "$commit" > "$dotest/author-script"
680 else
682 sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
683 echo
684 cat "$dotest/msg"
686 git stripspace > "$dotest/msg-clean"
689 esac
691 if test -f "$dotest/author-script"
692 then
693 eval $(cat "$dotest/author-script")
694 else
695 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
696 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
697 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
700 if test -z "$GIT_AUTHOR_EMAIL"
701 then
702 gettextln "Patch does not have a valid e-mail address."
703 stop_here $this
706 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
708 case "$resume" in
710 if test '' != "$SIGNOFF"
711 then
712 LAST_SIGNED_OFF_BY=`
713 sed -ne '/^Signed-off-by: /p' \
714 "$dotest/msg-clean" |
715 sed -ne '$p'
717 ADD_SIGNOFF=`
718 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
719 test '' = "$LAST_SIGNED_OFF_BY" && echo
720 echo "$SIGNOFF"
722 else
723 ADD_SIGNOFF=
726 if test -s "$dotest/msg-clean"
727 then
728 cat "$dotest/msg-clean"
730 if test '' != "$ADD_SIGNOFF"
731 then
732 echo "$ADD_SIGNOFF"
734 } >"$dotest/final-commit"
737 case "$resolved$interactive" in
739 # This is used only for interactive view option.
740 git diff-index --ignore-submodules -p --cached \
741 HEAD -- >"$dotest/patch"
743 esac
744 esac
746 resume=
747 if test "$interactive" = t
748 then
749 test -t 0 ||
750 die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
751 action=again
752 while test "$action" = again
754 gettextln "Commit Body is:"
755 echo "--------------------------"
756 cat "$dotest/final-commit"
757 echo "--------------------------"
758 # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
759 # in your translation. The program will only accept English
760 # input at this point.
761 gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
762 read reply
763 case "$reply" in
764 [yY]*) action=yes ;;
765 [aA]*) action=yes interactive= ;;
766 [nN]*) action=skip ;;
767 [eE]*) git_editor "$dotest/final-commit"
768 action=again ;;
769 [vV]*) action=again
770 git_pager "$dotest/patch" ;;
771 *) action=again ;;
772 esac
773 done
774 else
775 action=yes
778 if test -f "$dotest/final-commit"
779 then
780 FIRSTLINE=$(sed 1q "$dotest/final-commit")
781 else
782 FIRSTLINE=""
785 if test $action = skip
786 then
787 go_next
788 continue
791 if test -x "$GIT_DIR"/hooks/applypatch-msg
792 then
793 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
794 stop_here $this
797 say "$(eval_gettext "Applying: \$FIRSTLINE")"
799 case "$resolved" in
801 # When we are allowed to fall back to 3-way later, don't give
802 # false errors during the initial attempt.
803 squelch=
804 if test "$threeway" = t
805 then
806 squelch='>/dev/null 2>&1 '
808 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
809 apply_status=$?
812 # Resolved means the user did all the hard work, and
813 # we do not have to do any patch application. Just
814 # trust what the user has in the index file and the
815 # working tree.
816 resolved=
817 git diff-index --ignore-submodules --quiet --cached HEAD -- && {
818 gettextln "No changes - did you forget to use 'git add'?
819 If there is nothing left to stage, chances are that something else
820 already introduced the same changes; you might want to skip this patch."
821 stop_here_user_resolve $this
823 unmerged=$(git ls-files -u)
824 if test -n "$unmerged"
825 then
826 gettextln "You still have unmerged paths in your index
827 did you forget to use 'git add'?"
828 stop_here_user_resolve $this
830 apply_status=0
831 git rerere
833 esac
835 if test $apply_status != 0 && test "$threeway" = t
836 then
837 if (fall_back_3way)
838 then
839 # Applying the patch to an earlier tree and merging the
840 # result may have produced the same tree as ours.
841 git diff-index --ignore-submodules --quiet --cached \
842 HEAD -- && {
843 say "$(gettext "No changes -- Patch already applied.")"
844 go_next
845 continue
847 # clear apply_status -- we have successfully merged.
848 apply_status=0
851 if test $apply_status != 0
852 then
853 eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
854 stop_here_user_resolve $this
857 if test -x "$GIT_DIR"/hooks/pre-applypatch
858 then
859 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
862 tree=$(git write-tree) &&
863 commit=$(
864 if test -n "$ignore_date"
865 then
866 GIT_AUTHOR_DATE=
868 parent=$(git rev-parse --verify -q HEAD) ||
869 say >&2 "$(gettext "applying to an empty history")"
871 if test -n "$committer_date_is_author_date"
872 then
873 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
874 export GIT_COMMITTER_DATE
875 fi &&
876 git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
877 ) &&
878 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
879 stop_here $this
881 if test -f "$dotest/original-commit"; then
882 echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
885 if test -x "$GIT_DIR"/hooks/post-applypatch
886 then
887 "$GIT_DIR"/hooks/post-applypatch
890 go_next
891 done
893 if test -s "$dotest"/rewritten; then
894 git notes copy --for-rewrite=rebase < "$dotest"/rewritten
895 if test -x "$GIT_DIR"/hooks/post-rewrite; then
896 "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
900 rm -fr "$dotest"
901 git gc --auto