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
14 s,signoff add a Signed-off-by line to the commit message
15 u,utf8 recode into utf8 (default)
16 k,keep pass -k flag to git-mailinfo
17 whitespace= pass it through git-apply
18 directory= pass it through git-apply
19 C= pass it through git-apply
20 p= pass it through git-apply
21 patch-format= format the patch(es) are in
22 reject pass it through git-apply
23 resolvemsg= override error message when patch failure occurs
24 r,resolved to be used after a patch failure
25 skip skip the current patch
26 abort restore the original branch and abort the patching operation.
27 committer-date-is-author-date lie about committer date
28 ignore-date use current timestamp for author date
29 rebasing* (internal use for git-rebase)"
32 prefix=$(git rev-parse --show-prefix)
37 git var GIT_COMMITTER_IDENT >/dev/null ||
38 die "You need to set your committer info first"
40 if git rev-parse --verify -q HEAD >/dev/null
48 git rev-parse --sq-quote "$@"
52 echo "$1" >"$dotest/next"
56 stop_here_user_resolve () {
57 if [ -n "$resolvemsg" ]; then
58 printf '%s\n' "$resolvemsg"
62 if test '' != "$interactive"
66 if test '' != "$threeway"
70 echo "When you have resolved this problem run \"$cmdline --resolved\"."
71 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
72 echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
78 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
79 "$dotest/patch" "$dotest/info"
80 echo "$next" >"$dotest/next"
86 echo "Cannot fall back to three-way merge."
91 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
93 rm -fr "$dotest"/patch-merge-*
94 mkdir "$dotest/patch-merge-tmp-dir"
96 # First see if the patch records the index info that we can use.
97 git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
99 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
100 git write-tree >"$dotest/patch-merge-base+" ||
101 cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
103 echo Using index info to reconstruct a base tree...
104 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
105 git apply --cached <"$dotest/patch"
107 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
108 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
110 cannot_fallback "Did you hand edit your patch?
111 It does not apply to blobs recorded in its index."
114 test -f "$dotest/patch-merge-index" &&
115 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
116 orig_tree=$(cat "$dotest/patch-merge-base") &&
117 rm -fr "$dotest"/patch-merge-* || exit 1
119 echo Falling back to patching base and 3-way merge...
121 # This is not so wrong. Depending on which base we picked,
122 # orig_tree may be wildly different from ours, but his_tree
123 # has the same set of wildly different changes in parts the
124 # patch did not touch, so recursive ends up canceling them,
125 # saying that we reverted all those changes.
127 eval GITHEAD_$his_tree='"$FIRSTLINE"'
128 export GITHEAD_$his_tree
129 git-merge-recursive $orig_tree -- HEAD $his_tree || {
131 echo Failed to merge in the changes.
134 unset GITHEAD_$his_tree
139 check_patch_format () {
140 # early return if patch_format was set from the command line
141 if test -n "$patch_format"
146 # we default to mbox format if input is from stdin and for
148 if test $# = 0 || test "x$1" = "x-" || test -d "$1"
154 # otherwise, check the first few lines of the first patch to try
155 # to detect its format
161 "From "* | "From: "*)
164 '# This series applies on GIT commit'*)
165 patch_format=stgit-series
167 "# HG changeset patch")
171 # if the second line is empty and the third is
172 # a From, Author or Date entry, this is very
173 # likely an StGIT patch
175 ,"From: "* | ,"Author: "* | ,"Date: "*)
187 case "$patch_format" in
189 git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
197 echo "Only one StGIT patch series can be applied at once"
200 series_dir=`dirname "$1"`
207 set "$@" "$series_dir/$filename"
209 # remove the safety x
211 # remove the arg coming from the first-line comment
214 # set the patch format appropriately
216 # now handle the actual StGIT patches
223 this=`expr "$this" + 1`
224 msgnum=`printf "%0${prec}d" $this`
225 # Perl version of StGIT parse_patch. The first nonemptyline
226 # not starting with Author, From or Date is the
227 # subject, and the body starts with the next nonempty
228 # line not starting with Author, From or Date
229 perl -ne 'BEGIN { $subject = 0 }
230 if ($subject > 1) { print ; }
231 elsif (/^\s+$/) { next ; }
232 elsif (/^Author:/) { print s/Author/From/ ; }
233 elsif (/^(From|Date)/) { print ; }
239 print "Subject: ", $_ ;
242 ' < "$stgit" > "$dotest/$msgnum" || {
243 echo "Failed to import $patch_format patch $stgit"
247 echo "$this" > "$dotest/last"
252 echo "Patch format $patch_format is not supported."
259 dotest="$GIT_DIR/rebase-apply"
260 sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
263 committer_date_is_author_date=
278 utf8=t ;; # this is now default
290 rebasing=t threeway=t keep=t ;;
292 die "-d option is no longer supported. Do not use."
295 shift; resolvemsg=$1 ;;
296 --whitespace|--directory)
297 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
299 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
301 shift ; patch_format="$1" ;;
303 git_apply_opt="$git_apply_opt $1" ;;
304 --committer-date-is-author-date)
305 committer_date_is_author_date=t ;;
316 # If the dotest directory exists, but we have finished applying all the
317 # patches in them, clear it out.
318 if test -d "$dotest" &&
319 last=$(cat "$dotest/last") &&
320 next=$(cat "$dotest/next") &&
322 test "$next" -gt "$last"
329 case "$#,$skip$resolved$abort" in
331 # Explicit resume command and we do not have file, so
335 # No file input but without resume parameters; catch
336 # user error to feed us a patch from standard input
337 # when there is already $dotest. This is somewhat
338 # unreliable -- stdin could be /dev/null for example
339 # and the caller did not intend to feed us a patch but
340 # wanted to continue unattended.
347 die "previous rebase directory $dotest still exists but mbox given."
350 case "$skip,$abort" in
352 die "Please make up your mind. --skip or --abort?"
356 git read-tree --reset -u HEAD HEAD
357 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
359 git update-ref ORIG_HEAD $orig_head
362 if test -f "$dotest/rebasing"
364 exec git rebase --abort
367 test -f "$dotest/dirtyindex" || {
368 git read-tree --reset -u HEAD ORIG_HEAD
374 rm -f "$dotest/dirtyindex"
376 # Make sure we are not given --skip, --resolved, nor --abort
377 test "$skip$resolved$abort" = "" ||
378 die "Resolve operation not in progress, we are not resuming."
381 mkdir -p "$dotest" || exit
383 if test -n "$prefix" && test $# != 0
388 test -n "$first" && {
396 set "$@" "$prefix$arg" ;;
402 check_patch_format "$@"
406 # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
407 # for the resuming session after a patch failure.
408 # -i can and must be given when resuming.
409 echo " $git_apply_opt" >"$dotest/apply-opt"
410 echo "$threeway" >"$dotest/threeway"
411 echo "$sign" >"$dotest/sign"
412 echo "$utf8" >"$dotest/utf8"
413 echo "$keep" >"$dotest/keep"
414 echo 1 >"$dotest/next"
415 if test -n "$rebasing"
417 : >"$dotest/rebasing"
419 : >"$dotest/applying"
420 if test -n "$HAS_HEAD"
422 git update-ref ORIG_HEAD HEAD
424 git update-ref -d ORIG_HEAD >/dev/null 2>&1
433 files=$(git ls-files) ;;
435 files=$(git diff-index --cached --name-only HEAD --) ;;
439 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
440 die "Dirty index: cannot apply patches (dirty: $files)"
444 if test "$(cat "$dotest/utf8")" = t
450 if test "$(cat "$dotest/keep")" = t
454 if test "$(cat "$dotest/threeway")" = t
458 git_apply_opt=$(cat "$dotest/apply-opt")
459 if test "$(cat "$dotest/sign")" = t
461 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
463 s/^/Signed-off-by: /'
469 last=`cat "$dotest/last"`
470 this=`cat "$dotest/next"`
473 this=`expr "$this" + 1`
477 if test "$this" -gt "$last"
484 while test "$this" -le "$last"
486 msgnum=`printf "%0${prec}d" $this`
487 next=`expr "$this" + 1`
488 test -f "$dotest/$msgnum" || {
494 # If we are not resuming, parse and extract the patch information
495 # into separate files:
496 # - info records the authorship and title
497 # - msg is the rest of commit log message
498 # - patch is the patch body.
500 # When we are resuming, these files are either already prepared
501 # by the user, or the user can tell us to do so by --resolved flag.
504 git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
505 <"$dotest/$msgnum" >"$dotest/info" ||
508 # skip pine's internal folder data
509 grep '^Author: Mail System Internal Data$' \
510 <"$dotest"/info >/dev/null &&
513 test -s "$dotest/patch" || {
514 echo "Patch is empty. Was it split wrong?"
517 if test -f "$dotest/rebasing" &&
518 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
519 -e q "$dotest/$msgnum") &&
520 test "$(git cat-file -t "$commit")" = commit
522 git cat-file commit "$commit" |
523 sed -e '1,/^$/d' >"$dotest/msg-clean"
525 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
526 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
528 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
529 git stripspace > "$dotest/msg-clean"
534 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
535 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
536 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
538 if test -z "$GIT_AUTHOR_EMAIL"
540 echo "Patch does not have a valid e-mail address."
544 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
548 if test '' != "$SIGNOFF"
551 sed -ne '/^Signed-off-by: /p' \
552 "$dotest/msg-clean" |
556 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
557 test '' = "$LAST_SIGNED_OFF_BY" && echo
564 if test -s "$dotest/msg-clean"
566 cat "$dotest/msg-clean"
568 if test '' != "$ADD_SIGNOFF"
572 } >"$dotest/final-commit"
575 case "$resolved$interactive" in
577 # This is used only for interactive view option.
578 git diff-index -p --cached HEAD -- >"$dotest/patch"
584 if test "$interactive" = t
587 die "cannot be interactive without stdin connected to a terminal."
589 while test "$action" = again
591 echo "Commit Body is:"
592 echo "--------------------------"
593 cat "$dotest/final-commit"
594 echo "--------------------------"
595 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
599 [aA]*) action=yes interactive= ;;
600 [nN]*) action=skip ;;
601 [eE]*) git_editor "$dotest/final-commit"
604 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
611 FIRSTLINE=$(sed 1q "$dotest/final-commit")
613 if test $action = skip
619 if test -x "$GIT_DIR"/hooks/applypatch-msg
621 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
625 printf 'Applying: %s\n' "$FIRSTLINE"
629 eval 'git apply '"$git_apply_opt"' --index "$dotest/patch"'
633 # Resolved means the user did all the hard work, and
634 # we do not have to do any patch application. Just
635 # trust what the user has in the index file and the
638 git diff-index --quiet --cached HEAD -- && {
639 echo "No changes - did you forget to use 'git add'?"
640 stop_here_user_resolve $this
642 unmerged=$(git ls-files -u)
643 if test -n "$unmerged"
645 echo "You still have unmerged paths in your index"
646 echo "did you forget to use 'git add'?"
647 stop_here_user_resolve $this
654 if test $apply_status = 1 && test "$threeway" = t
658 # Applying the patch to an earlier tree and merging the
659 # result may have produced the same tree as ours.
660 git diff-index --quiet --cached HEAD -- && {
661 echo No changes -- Patch already applied.
665 # clear apply_status -- we have successfully merged.
669 if test $apply_status != 0
671 printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
672 stop_here_user_resolve $this
675 if test -x "$GIT_DIR"/hooks/pre-applypatch
677 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
680 tree=$(git write-tree) &&
682 if test -n "$ignore_date"
686 parent=$(git rev-parse --verify -q HEAD) ||
687 echo >&2 "applying to an empty history"
689 if test -n "$committer_date_is_author_date"
691 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
692 export GIT_COMMITTER_DATE
694 git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
696 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
699 if test -x "$GIT_DIR"/hooks/post-applypatch
701 "$GIT_DIR"/hooks/post-applypatch