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 whitespace= pass it through git-apply
19 directory= pass it through git-apply
20 C= pass it through git-apply
21 p= pass it through git-apply
22 patch-format= format the patch(es) are in
23 reject pass it through git-apply
24 resolvemsg= override error message when patch failure occurs
25 r,resolved to be used after a patch failure
26 skip skip the current patch
27 abort restore the original branch and abort the patching operation.
28 committer-date-is-author-date lie about committer date
29 ignore-date use current timestamp for author date
30 rebasing* (internal use for git-rebase)"
33 prefix
=$
(git rev-parse
--show-prefix)
38 git var GIT_COMMITTER_IDENT
>/dev
/null ||
39 die
"You need to set your committer info first"
41 if git rev-parse
--verify -q HEAD
>/dev
/null
49 git rev-parse
--sq-quote "$@"
53 echo "$1" >"$dotest/next"
57 stop_here_user_resolve
() {
58 if [ -n "$resolvemsg" ]; then
59 printf '%s\n' "$resolvemsg"
63 if test '' != "$interactive"
67 if test '' != "$threeway"
71 echo "When you have resolved this problem run \"$cmdline --resolved\"."
72 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
73 echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
79 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
80 "$dotest/patch" "$dotest/info"
81 echo "$next" >"$dotest/next"
87 echo "Cannot fall back to three-way merge."
92 O_OBJECT
=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
94 rm -fr "$dotest"/patch-merge-
*
95 mkdir
"$dotest/patch-merge-tmp-dir"
97 # First see if the patch records the index info that we can use.
98 git apply
--build-fake-ancestor "$dotest/patch-merge-tmp-index" \
100 GIT_INDEX_FILE
="$dotest/patch-merge-tmp-index" \
101 git write-tree
>"$dotest/patch-merge-base+" ||
102 cannot_fallback
"Repository lacks necessary blobs to fall back on 3-way merge."
104 say Using index info to reconstruct a base tree...
105 if GIT_INDEX_FILE
="$dotest/patch-merge-tmp-index" \
106 git apply
--cached <"$dotest/patch"
108 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
109 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
111 cannot_fallback
"Did you hand edit your patch?
112 It does not apply to blobs recorded in its index."
115 test -f "$dotest/patch-merge-index" &&
116 his_tree
=$
(GIT_INDEX_FILE
="$dotest/patch-merge-index" git write-tree
) &&
117 orig_tree
=$
(cat "$dotest/patch-merge-base") &&
118 rm -fr "$dotest"/patch-merge-
* ||
exit 1
120 say Falling back to patching base and
3-way merge...
122 # This is not so wrong. Depending on which base we picked,
123 # orig_tree may be wildly different from ours, but his_tree
124 # has the same set of wildly different changes in parts the
125 # patch did not touch, so recursive ends up canceling them,
126 # saying that we reverted all those changes.
128 eval GITHEAD_
$his_tree='"$FIRSTLINE"'
129 export GITHEAD_
$his_tree
130 if test -n "$GIT_QUIET"
132 export GIT_MERGE_VERBOSITY
=0
134 git-merge-recursive
$orig_tree -- HEAD
$his_tree ||
{
136 echo Failed to merge
in the changes.
139 unset GITHEAD_
$his_tree
143 test $# = 0 ||
echo >&2 "$@"
150 check_patch_format
() {
151 # early return if patch_format was set from the command line
152 if test -n "$patch_format"
157 # we default to mbox format if input is from stdin and for
159 if test $# = 0 ||
test "x$1" = "x-" ||
test -d "$1"
165 # otherwise, check the first few lines of the first patch to try
166 # to detect its format
172 "From "* |
"From: "*)
175 '# This series applies on GIT commit'*)
176 patch_format
=stgit-series
178 "# HG changeset patch")
182 # if the second line is empty and the third is
183 # a From, Author or Date entry, this is very
184 # likely an StGIT patch
186 ,"From: "* |
,"Author: "* |
,"Date: "*)
194 if test -z "$patch_format" &&
199 # This begins with three non-empty lines. Is this a
200 # piece of e-mail a-la RFC2822? Grab all the headers,
201 # discarding the indented remainder of folded lines,
202 # and see if it looks like that they all begin with the
203 # header field names...
204 sed -n -e '/^$/q' -e '/^[ ]/d' -e p
"$1" |
205 egrep -v '^[A-Za-z]+(-[A-Za-z]+)*:' >/dev
/null ||
208 } < "$1" || clean_abort
212 case "$patch_format" in
214 git mailsplit
-d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||
220 clean_abort
"Only one StGIT patch series can be applied at once"
222 series_dir
=`dirname "$1"`
229 set "$@" "$series_dir/$filename"
231 # remove the safety x
233 # remove the arg coming from the first-line comment
235 } < "$series_file" || clean_abort
236 # set the patch format appropriately
238 # now handle the actual StGIT patches
245 this
=`expr "$this" + 1`
246 msgnum
=`printf "%0${prec}d" $this`
247 # Perl version of StGIT parse_patch. The first nonemptyline
248 # not starting with Author, From or Date is the
249 # subject, and the body starts with the next nonempty
250 # line not starting with Author, From or Date
251 perl
-ne 'BEGIN { $subject = 0 }
252 if ($subject > 1) { print ; }
253 elsif (/^\s+$/) { next ; }
254 elsif (/^Author:/) { print s/Author/From/ ; }
255 elsif (/^(From|Date)/) { print ; }
261 print "Subject: ", $_ ;
264 ' < "$stgit" > "$dotest/$msgnum" || clean_abort
266 echo "$this" > "$dotest/last"
271 if test -n "$patch_format"
273 clean_abort
"Patch format $patch_format is not supported."
275 clean_abort
"Patch format detection failed."
282 dotest
="$GIT_DIR/rebase-apply"
283 sign
= utf8
=t keep
= skip
= interactive
= resolved
= rebasing
= abort
=
286 committer_date_is_author_date
=
301 utf8
=t
;; # this is now default
313 rebasing
=t threeway
=t keep
=t
;;
315 die
"-d option is no longer supported. Do not use."
318 shift; resolvemsg
=$1 ;;
319 --whitespace|
--directory)
320 git_apply_opt
="$git_apply_opt $(sq "$1=$2")"; shift ;;
322 git_apply_opt
="$git_apply_opt $(sq "$1$2")"; shift ;;
324 shift ; patch_format
="$1" ;;
326 git_apply_opt
="$git_apply_opt $1" ;;
327 --committer-date-is-author-date)
328 committer_date_is_author_date
=t
;;
341 # If the dotest directory exists, but we have finished applying all the
342 # patches in them, clear it out.
343 if test -d "$dotest" &&
344 last
=$
(cat "$dotest/last") &&
345 next
=$
(cat "$dotest/next") &&
347 test "$next" -gt "$last"
354 case "$#,$skip$resolved$abort" in
356 # Explicit resume command and we do not have file, so
360 # No file input but without resume parameters; catch
361 # user error to feed us a patch from standard input
362 # when there is already $dotest. This is somewhat
363 # unreliable -- stdin could be /dev/null for example
364 # and the caller did not intend to feed us a patch but
365 # wanted to continue unattended.
372 die
"previous rebase directory $dotest still exists but mbox given."
375 case "$skip,$abort" in
377 die
"Please make up your mind. --skip or --abort?"
381 git read-tree
--reset -u HEAD HEAD
382 orig_head
=$
(cat "$GIT_DIR/ORIG_HEAD")
384 git update-ref ORIG_HEAD
$orig_head
387 if test -f "$dotest/rebasing"
389 exec git rebase
--abort
392 test -f "$dotest/dirtyindex" ||
{
393 git read-tree
--reset -u HEAD ORIG_HEAD
399 rm -f "$dotest/dirtyindex"
401 # Make sure we are not given --skip, --resolved, nor --abort
402 test "$skip$resolved$abort" = "" ||
403 die
"Resolve operation not in progress, we are not resuming."
406 mkdir
-p "$dotest" ||
exit
408 if test -n "$prefix" && test $# != 0
413 test -n "$first" && {
421 set "$@" "$prefix$arg" ;;
427 check_patch_format
"$@"
431 # -s, -u, -k, --whitespace, -3, -C, -q and -p flags are kept
432 # for the resuming session after a patch failure.
433 # -i can and must be given when resuming.
434 echo " $git_apply_opt" >"$dotest/apply-opt"
435 echo "$threeway" >"$dotest/threeway"
436 echo "$sign" >"$dotest/sign"
437 echo "$utf8" >"$dotest/utf8"
438 echo "$keep" >"$dotest/keep"
439 echo "$GIT_QUIET" >"$dotest/quiet"
440 echo 1 >"$dotest/next"
441 if test -n "$rebasing"
443 : >"$dotest/rebasing"
445 : >"$dotest/applying"
446 if test -n "$HAS_HEAD"
448 git update-ref ORIG_HEAD HEAD
450 git update-ref
-d ORIG_HEAD
>/dev
/null
2>&1
459 files
=$
(git ls-files
) ;;
461 files
=$
(git diff-index
--cached --name-only HEAD
--) ;;
465 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
466 die
"Dirty index: cannot apply patches (dirty: $files)"
470 if test "$(cat "$dotest/utf8
")" = t
476 if test "$(cat "$dotest/keep
")" = t
480 if test "$(cat "$dotest/quiet
")" = t
484 if test "$(cat "$dotest/threeway
")" = t
488 git_apply_opt
=$
(cat "$dotest/apply-opt")
489 if test "$(cat "$dotest/sign
")" = t
491 SIGNOFF
=`git var GIT_COMMITTER_IDENT | sed -e '
493 s/^/Signed-off-by: /'
499 last
=`cat "$dotest/last"`
500 this
=`cat "$dotest/next"`
503 this
=`expr "$this" + 1`
507 if test "$this" -gt "$last"
514 while test "$this" -le "$last"
516 msgnum
=`printf "%0${prec}d" $this`
517 next
=`expr "$this" + 1`
518 test -f "$dotest/$msgnum" ||
{
524 # If we are not resuming, parse and extract the patch information
525 # into separate files:
526 # - info records the authorship and title
527 # - msg is the rest of commit log message
528 # - patch is the patch body.
530 # When we are resuming, these files are either already prepared
531 # by the user, or the user can tell us to do so by --resolved flag.
534 git mailinfo
$keep $utf8 "$dotest/msg" "$dotest/patch" \
535 <"$dotest/$msgnum" >"$dotest/info" ||
538 # skip pine's internal folder data
539 grep '^Author: Mail System Internal Data$' \
540 <"$dotest"/info
>/dev
/null
&&
543 test -s "$dotest/patch" ||
{
544 echo "Patch is empty. Was it split wrong?"
547 if test -f "$dotest/rebasing" &&
548 commit
=$
(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
549 -e q
"$dotest/$msgnum") &&
550 test "$(git cat-file -t "$commit")" = commit
552 git cat-file commit
"$commit" |
553 sed -e '1,/^$/d' >"$dotest/msg-clean"
555 SUBJECT
="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info
")"
556 case "$keep_subject" in -k) SUBJECT
="[PATCH] $SUBJECT" ;; esac
558 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
559 git stripspace
> "$dotest/msg-clean"
564 GIT_AUTHOR_NAME
="$(sed -n '/^Author/ s/Author: //p' "$dotest/info
")"
565 GIT_AUTHOR_EMAIL
="$(sed -n '/^Email/ s/Email: //p' "$dotest/info
")"
566 GIT_AUTHOR_DATE
="$(sed -n '/^Date/ s/Date: //p' "$dotest/info
")"
568 if test -z "$GIT_AUTHOR_EMAIL"
570 echo "Patch does not have a valid e-mail address."
574 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
578 if test '' != "$SIGNOFF"
581 sed -ne '/^Signed-off-by: /p' \
582 "$dotest/msg-clean" |
586 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
587 test '' = "$LAST_SIGNED_OFF_BY" && echo
594 if test -s "$dotest/msg-clean"
596 cat "$dotest/msg-clean"
598 if test '' != "$ADD_SIGNOFF"
602 } >"$dotest/final-commit"
605 case "$resolved$interactive" in
607 # This is used only for interactive view option.
608 git diff-index
-p --cached HEAD
-- >"$dotest/patch"
614 if test "$interactive" = t
617 die
"cannot be interactive without stdin connected to a terminal."
619 while test "$action" = again
621 echo "Commit Body is:"
622 echo "--------------------------"
623 cat "$dotest/final-commit"
624 echo "--------------------------"
625 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
629 [aA
]*) action
=yes interactive
= ;;
630 [nN
]*) action
=skip
;;
631 [eE
]*) git_editor
"$dotest/final-commit"
634 LESS
=-S ${PAGER:-less} "$dotest/patch" ;;
641 FIRSTLINE
=$
(sed 1q
"$dotest/final-commit")
643 if test $action = skip
649 if test -x "$GIT_DIR"/hooks
/applypatch-msg
651 "$GIT_DIR"/hooks
/applypatch-msg
"$dotest/final-commit" ||
655 say
"Applying: $FIRSTLINE"
659 # When we are allowed to fall back to 3-way later, don't give
660 # false errors during the initial attempt.
662 if test "$threeway" = t
664 squelch
='>/dev/null 2>&1 '
666 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
670 # Resolved means the user did all the hard work, and
671 # we do not have to do any patch application. Just
672 # trust what the user has in the index file and the
675 git diff-index
--quiet --cached HEAD
-- && {
676 echo "No changes - did you forget to use 'git add'?"
677 stop_here_user_resolve
$this
679 unmerged
=$
(git ls-files
-u)
680 if test -n "$unmerged"
682 echo "You still have unmerged paths in your index"
683 echo "did you forget to use 'git add'?"
684 stop_here_user_resolve
$this
691 if test $apply_status = 1 && test "$threeway" = t
695 # Applying the patch to an earlier tree and merging the
696 # result may have produced the same tree as ours.
697 git diff-index
--quiet --cached HEAD
-- && {
698 say No changes
-- Patch already applied.
702 # clear apply_status -- we have successfully merged.
706 if test $apply_status != 0
708 printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
709 stop_here_user_resolve
$this
712 if test -x "$GIT_DIR"/hooks
/pre-applypatch
714 "$GIT_DIR"/hooks
/pre-applypatch || stop_here
$this
717 tree
=$
(git write-tree
) &&
719 if test -n "$ignore_date"
723 parent
=$
(git rev-parse
--verify -q HEAD
) ||
724 say
>&2 "applying to an empty history"
726 if test -n "$committer_date_is_author_date"
728 GIT_COMMITTER_DATE
="$GIT_AUTHOR_DATE"
729 export GIT_COMMITTER_DATE
731 git commit-tree
$tree ${parent:+-p} $parent <"$dotest/final-commit"
733 git update-ref
-m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD
$commit $parent ||
736 if test -x "$GIT_DIR"/hooks
/post-applypatch
738 "$GIT_DIR"/hooks
/post-applypatch