3 # Copyright (c) 2005, 2006 Junio C Hamano
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
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-cr pass --keep-cr flag to git-mailsplit for mbox format
19 no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
20 c,scissors strip everything before a scissors line
21 whitespace= pass it through git-apply
22 ignore-space-change pass it through git-apply
23 ignore-whitespace pass it through git-apply
24 directory= pass it through git-apply
25 exclude= pass it through git-apply
26 C= pass it through git-apply
27 p= pass it through git-apply
28 patch-format= format the patch(es) are in
29 reject pass it through git-apply
30 resolvemsg= override error message when patch failure occurs
31 continue continue applying patches after resolving a conflict
32 r,resolved synonyms for --continue
33 skip skip the current patch
34 abort restore the original branch and abort the patching operation.
35 committer-date-is-author-date lie about committer date
36 ignore-date use current timestamp for author date
37 rerere-autoupdate update the index with reused conflict resolution if possible
38 rebasing* (internal use for git-rebase)"
41 prefix=$(git rev-parse --show-prefix)
46 git var GIT_COMMITTER_IDENT >/dev/null ||
47 die "You need to set your committer info first"
49 if git rev-parse --verify -q HEAD >/dev/null
57 if test '' != "$interactive"
61 if test '' != "$threeway"
67 git rev-parse --sq-quote "$@"
71 echo "$1" >"$dotest/next"
72 git rev-parse --verify -q HEAD >"$dotest/abort-safety"
77 if test -f "$dotest/dirtyindex"
82 if ! test -s "$dotest/abort-safety"
87 abort_safety=$(cat "$dotest/abort-safety")
88 if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
92 echo >&2 "You seem to have moved HEAD since the last 'am' failure."
93 echo >&2 "Not rewinding to ORIG_HEAD"
97 stop_here_user_resolve () {
98 if [ -n "$resolvemsg" ]; then
99 printf '%s\n' "$resolvemsg"
102 echo "When you have resolved this problem run \"$cmdline --resolved\"."
103 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
104 echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
110 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
111 "$dotest/patch" "$dotest/info"
112 echo "$next" >"$dotest/next"
118 echo "Cannot fall back to three-way merge."
123 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
125 rm -fr "$dotest"/patch-merge-*
126 mkdir "$dotest/patch-merge-tmp-dir"
128 # First see if the patch records the index info that we can use.
129 git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
131 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
132 git write-tree >"$dotest/patch-merge-base+" ||
133 cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
135 say Using index info to reconstruct a base tree...
136 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
137 git apply --cached <"$dotest/patch"
139 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
140 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
142 cannot_fallback "Did you hand edit your patch?
143 It does not apply to blobs recorded in its index."
146 test -f "$dotest/patch-merge-index" &&
147 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
148 orig_tree=$(cat "$dotest/patch-merge-base") &&
149 rm -fr "$dotest"/patch-merge-* || exit 1
151 say Falling back to patching base and 3-way merge...
153 # This is not so wrong. Depending on which base we picked,
154 # orig_tree may be wildly different from ours, but his_tree
155 # has the same set of wildly different changes in parts the
156 # patch did not touch, so recursive ends up canceling them,
157 # saying that we reverted all those changes.
159 eval GITHEAD_$his_tree='"$FIRSTLINE"'
160 export GITHEAD_$his_tree
161 if test -n "$GIT_QUIET"
163 GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
165 git-merge-recursive $orig_tree -- HEAD $his_tree || {
166 git rerere $allow_rerere_autoupdate
167 echo Failed to merge in the changes.
170 unset GITHEAD_$his_tree
174 test $# = 0 || echo >&2 "$@"
181 check_patch_format () {
182 # early return if patch_format was set from the command line
183 if test -n "$patch_format"
188 # we default to mbox format if input is from stdin and for
190 if test $# = 0 || test "x$1" = "x-" || test -d "$1"
196 # otherwise, check the first few lines of the first patch to try
197 # to detect its format
203 "From "* | "From: "*)
206 '# This series applies on GIT commit'*)
207 patch_format=stgit-series
209 "# HG changeset patch")
213 # if the second line is empty and the third is
214 # a From, Author or Date entry, this is very
215 # likely an StGIT patch
217 ,"From: "* | ,"Author: "* | ,"Date: "*)
225 if test -z "$patch_format" &&
230 # This begins with three non-empty lines. Is this a
231 # piece of e-mail a-la RFC2822? Grab all the headers,
232 # discarding the indented remainder of folded lines,
233 # and see if it looks like that they all begin with the
234 # header field names...
236 sed -n -e '/^$/q' -e '/^[ ]/d' -e p |
237 sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
240 } < "$1" || clean_abort
244 case "$patch_format" in
246 if test -n "$rebasing" || test t = "$keepcr"
252 git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
258 clean_abort "Only one StGIT patch series can be applied at once"
260 series_dir=`dirname "$1"`
267 set "$@" "$series_dir/$filename"
269 # remove the safety x
271 # remove the arg coming from the first-line comment
273 } < "$series_file" || clean_abort
274 # set the patch format appropriately
276 # now handle the actual StGIT patches
283 this=`expr "$this" + 1`
284 msgnum=`printf "%0${prec}d" $this`
285 # Perl version of StGIT parse_patch. The first nonemptyline
286 # not starting with Author, From or Date is the
287 # subject, and the body starts with the next nonempty
288 # line not starting with Author, From or Date
289 perl -ne 'BEGIN { $subject = 0 }
290 if ($subject > 1) { print ; }
291 elsif (/^\s+$/) { next ; }
292 elsif (/^Author:/) { print s/Author/From/ ; }
293 elsif (/^(From|Date)/) { print ; }
299 print "Subject: ", $_ ;
302 ' < "$stgit" > "$dotest/$msgnum" || clean_abort
304 echo "$this" > "$dotest/last"
309 if test -n "$parse_patch" ; then
310 clean_abort "Patch format $patch_format is not supported."
312 clean_abort "Patch format detection failed."
319 dotest="$GIT_DIR/rebase-apply"
320 sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
321 resolvemsg= resume= scissors= no_inbody_headers=
323 committer_date_is_author_date=
325 allow_rerere_autoupdate=
327 if test "$(git config --bool --get am.keepcr)" = true
344 utf8=t ;; # this is now default
353 -r|--resolved|--continue)
360 rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
362 die "-d option is no longer supported. Do not use."
365 shift; resolvemsg=$1 ;;
366 --whitespace|--directory|--exclude)
367 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
369 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
371 shift ; patch_format="$1" ;;
372 --reject|--ignore-whitespace|--ignore-space-change)
373 git_apply_opt="$git_apply_opt $1" ;;
374 --committer-date-is-author-date)
375 committer_date_is_author_date=t ;;
378 --rerere-autoupdate|--no-rerere-autoupdate)
379 allow_rerere_autoupdate="$1" ;;
394 # If the dotest directory exists, but we have finished applying all the
395 # patches in them, clear it out.
396 if test -d "$dotest" &&
397 last=$(cat "$dotest/last") &&
398 next=$(cat "$dotest/next") &&
400 test "$next" -gt "$last"
407 case "$#,$skip$resolved$abort" in
409 # Explicit resume command and we do not have file, so
413 # No file input but without resume parameters; catch
414 # user error to feed us a patch from standard input
415 # when there is already $dotest. This is somewhat
416 # unreliable -- stdin could be /dev/null for example
417 # and the caller did not intend to feed us a patch but
418 # wanted to continue unattended.
425 die "previous rebase directory $dotest still exists but mbox given."
428 case "$skip,$abort" in
430 die "Please make up your mind. --skip or --abort?"
434 git read-tree --reset -u HEAD HEAD
435 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
437 git update-ref ORIG_HEAD $orig_head
440 if test -f "$dotest/rebasing"
442 exec git rebase --abort
447 git read-tree --reset -u HEAD ORIG_HEAD
453 rm -f "$dotest/dirtyindex"
455 # Make sure we are not given --skip, --resolved, nor --abort
456 test "$skip$resolved$abort" = "" ||
457 die "Resolve operation not in progress, we are not resuming."
460 mkdir -p "$dotest" || exit
462 if test -n "$prefix" && test $# != 0
467 test -n "$first" && {
471 if is_absolute_path "$arg"
475 set "$@" "$prefix$arg"
481 check_patch_format "$@"
485 # -i can and must be given when resuming; everything
487 echo " $git_apply_opt" >"$dotest/apply-opt"
488 echo "$threeway" >"$dotest/threeway"
489 echo "$sign" >"$dotest/sign"
490 echo "$utf8" >"$dotest/utf8"
491 echo "$keep" >"$dotest/keep"
492 echo "$keepcr" >"$dotest/keepcr"
493 echo "$scissors" >"$dotest/scissors"
494 echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
495 echo "$GIT_QUIET" >"$dotest/quiet"
496 echo 1 >"$dotest/next"
497 if test -n "$rebasing"
499 : >"$dotest/rebasing"
501 : >"$dotest/applying"
502 if test -n "$HAS_HEAD"
504 git update-ref ORIG_HEAD HEAD
506 git update-ref -d ORIG_HEAD >/dev/null 2>&1
515 files=$(git ls-files) ;;
517 files=$(git diff-index --cached --name-only HEAD --) ;;
521 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
522 die "Dirty index: cannot apply patches (dirty: $files)"
526 if test "$(cat "$dotest/utf8")" = t
532 if test "$(cat "$dotest/keep")" = t
536 case "$(cat "$dotest/keepcr")" in
540 keepcr=--no-keep-cr ;;
542 case "$(cat "$dotest/scissors")" in
544 scissors=--scissors ;;
546 scissors=--no-scissors ;;
548 if test "$(cat "$dotest/no_inbody_headers")" = t
550 no_inbody_headers=--no-inbody-headers
554 if test "$(cat "$dotest/quiet")" = t
558 if test "$(cat "$dotest/threeway")" = t
562 git_apply_opt=$(cat "$dotest/apply-opt")
563 if test "$(cat "$dotest/sign")" = t
565 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
567 s/^/Signed-off-by: /'
573 last=`cat "$dotest/last"`
574 this=`cat "$dotest/next"`
577 this=`expr "$this" + 1`
581 while test "$this" -le "$last"
583 msgnum=`printf "%0${prec}d" $this`
584 next=`expr "$this" + 1`
585 test -f "$dotest/$msgnum" || {
591 # If we are not resuming, parse and extract the patch information
592 # into separate files:
593 # - info records the authorship and title
594 # - msg is the rest of commit log message
595 # - patch is the patch body.
597 # When we are resuming, these files are either already prepared
598 # by the user, or the user can tell us to do so by --resolved flag.
601 git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
602 <"$dotest/$msgnum" >"$dotest/info" ||
605 # skip pine's internal folder data
606 sane_grep '^Author: Mail System Internal Data$' \
607 <"$dotest"/info >/dev/null &&
610 test -s "$dotest/patch" || {
611 echo "Patch is empty. Was it split wrong?"
612 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
613 echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
616 rm -f "$dotest/original-commit" "$dotest/author-script"
617 if test -f "$dotest/rebasing" &&
618 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
619 -e q "$dotest/$msgnum") &&
620 test "$(git cat-file -t "$commit")" = commit
622 git cat-file commit "$commit" |
623 sed -e '1,/^$/d' >"$dotest/msg-clean"
624 echo "$commit" > "$dotest/original-commit"
625 get_author_ident_from_commit "$commit" > "$dotest/author-script"
628 sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
632 git stripspace > "$dotest/msg-clean"
637 if test -f "$dotest/author-script"
639 eval $(cat "$dotest/author-script")
641 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
642 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
643 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
646 if test -z "$GIT_AUTHOR_EMAIL"
648 echo "Patch does not have a valid e-mail address."
652 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
656 if test '' != "$SIGNOFF"
659 sed -ne '/^Signed-off-by: /p' \
660 "$dotest/msg-clean" |
664 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
665 test '' = "$LAST_SIGNED_OFF_BY" && echo
672 if test -s "$dotest/msg-clean"
674 cat "$dotest/msg-clean"
676 if test '' != "$ADD_SIGNOFF"
680 } >"$dotest/final-commit"
683 case "$resolved$interactive" in
685 # This is used only for interactive view option.
686 git diff-index -p --cached HEAD -- >"$dotest/patch"
692 if test "$interactive" = t
695 die "cannot be interactive without stdin connected to a terminal."
697 while test "$action" = again
699 echo "Commit Body is:"
700 echo "--------------------------"
701 cat "$dotest/final-commit"
702 echo "--------------------------"
703 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
707 [aA]*) action=yes interactive= ;;
708 [nN]*) action=skip ;;
709 [eE]*) git_editor "$dotest/final-commit"
712 git_pager "$dotest/patch" ;;
720 if test -f "$dotest/final-commit"
722 FIRSTLINE=$(sed 1q "$dotest/final-commit")
727 if test $action = skip
733 if test -x "$GIT_DIR"/hooks/applypatch-msg
735 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
739 say "Applying: $FIRSTLINE"
743 # When we are allowed to fall back to 3-way later, don't give
744 # false errors during the initial attempt.
746 if test "$threeway" = t
748 squelch='>/dev/null 2>&1 '
750 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
754 # Resolved means the user did all the hard work, and
755 # we do not have to do any patch application. Just
756 # trust what the user has in the index file and the
759 git diff-index --quiet --cached HEAD -- && {
760 echo "No changes - did you forget to use 'git add'?"
761 echo "If there is nothing left to stage, chances are that something else"
762 echo "already introduced the same changes; you might want to skip this patch."
763 stop_here_user_resolve $this
765 unmerged=$(git ls-files -u)
766 if test -n "$unmerged"
768 echo "You still have unmerged paths in your index"
769 echo "did you forget to use 'git add'?"
770 stop_here_user_resolve $this
777 if test $apply_status != 0 && test "$threeway" = t
781 # Applying the patch to an earlier tree and merging the
782 # result may have produced the same tree as ours.
783 git diff-index --quiet --cached HEAD -- && {
784 say No changes -- Patch already applied.
788 # clear apply_status -- we have successfully merged.
792 if test $apply_status != 0
794 printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
795 stop_here_user_resolve $this
798 if test -x "$GIT_DIR"/hooks/pre-applypatch
800 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
803 tree=$(git write-tree) &&
805 if test -n "$ignore_date"
809 parent=$(git rev-parse --verify -q HEAD) ||
810 say >&2 "applying to an empty history"
812 if test -n "$committer_date_is_author_date"
814 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
815 export GIT_COMMITTER_DATE
817 git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
819 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
822 if test -f "$dotest/original-commit"; then
823 echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
826 if test -x "$GIT_DIR"/hooks/post-applypatch
828 "$GIT_DIR"/hooks/post-applypatch
834 if test -s "$dotest"/rewritten; then
835 git notes copy --for-rewrite=rebase < "$dotest"/rewritten
836 if test -x "$GIT_DIR"/hooks/post-rewrite; then
837 "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten