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"
149 case "$patch_format" in
151 git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
157 echo "Patch format $patch_format is not supported."
164 dotest="$GIT_DIR/rebase-apply"
165 sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
168 committer_date_is_author_date=
183 utf8=t ;; # this is now default
195 rebasing=t threeway=t keep=t ;;
197 die "-d option is no longer supported. Do not use."
200 shift; resolvemsg=$1 ;;
201 --whitespace|--directory)
202 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
204 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
206 shift ; patch_format="$1" ;;
208 git_apply_opt="$git_apply_opt $1" ;;
209 --committer-date-is-author-date)
210 committer_date_is_author_date=t ;;
221 # If the dotest directory exists, but we have finished applying all the
222 # patches in them, clear it out.
223 if test -d "$dotest" &&
224 last=$(cat "$dotest/last") &&
225 next=$(cat "$dotest/next") &&
227 test "$next" -gt "$last"
234 case "$#,$skip$resolved$abort" in
236 # Explicit resume command and we do not have file, so
240 # No file input but without resume parameters; catch
241 # user error to feed us a patch from standard input
242 # when there is already $dotest. This is somewhat
243 # unreliable -- stdin could be /dev/null for example
244 # and the caller did not intend to feed us a patch but
245 # wanted to continue unattended.
252 die "previous rebase directory $dotest still exists but mbox given."
255 case "$skip,$abort" in
257 die "Please make up your mind. --skip or --abort?"
261 git read-tree --reset -u HEAD HEAD
262 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
264 git update-ref ORIG_HEAD $orig_head
267 if test -f "$dotest/rebasing"
269 exec git rebase --abort
272 test -f "$dotest/dirtyindex" || {
273 git read-tree --reset -u HEAD ORIG_HEAD
279 rm -f "$dotest/dirtyindex"
281 # Make sure we are not given --skip, --resolved, nor --abort
282 test "$skip$resolved$abort" = "" ||
283 die "Resolve operation not in progress, we are not resuming."
286 mkdir -p "$dotest" || exit
288 if test -n "$prefix" && test $# != 0
293 test -n "$first" && {
301 set "$@" "$prefix$arg" ;;
307 check_patch_format "$@"
311 # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
312 # for the resuming session after a patch failure.
313 # -i can and must be given when resuming.
314 echo " $git_apply_opt" >"$dotest/apply-opt"
315 echo "$threeway" >"$dotest/threeway"
316 echo "$sign" >"$dotest/sign"
317 echo "$utf8" >"$dotest/utf8"
318 echo "$keep" >"$dotest/keep"
319 echo 1 >"$dotest/next"
320 if test -n "$rebasing"
322 : >"$dotest/rebasing"
324 : >"$dotest/applying"
325 if test -n "$HAS_HEAD"
327 git update-ref ORIG_HEAD HEAD
329 git update-ref -d ORIG_HEAD >/dev/null 2>&1
338 files=$(git ls-files) ;;
340 files=$(git diff-index --cached --name-only HEAD --) ;;
344 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
345 die "Dirty index: cannot apply patches (dirty: $files)"
349 if test "$(cat "$dotest/utf8")" = t
355 if test "$(cat "$dotest/keep")" = t
359 if test "$(cat "$dotest/threeway")" = t
363 git_apply_opt=$(cat "$dotest/apply-opt")
364 if test "$(cat "$dotest/sign")" = t
366 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
368 s/^/Signed-off-by: /'
374 last=`cat "$dotest/last"`
375 this=`cat "$dotest/next"`
378 this=`expr "$this" + 1`
382 if test "$this" -gt "$last"
389 while test "$this" -le "$last"
391 msgnum=`printf "%0${prec}d" $this`
392 next=`expr "$this" + 1`
393 test -f "$dotest/$msgnum" || {
399 # If we are not resuming, parse and extract the patch information
400 # into separate files:
401 # - info records the authorship and title
402 # - msg is the rest of commit log message
403 # - patch is the patch body.
405 # When we are resuming, these files are either already prepared
406 # by the user, or the user can tell us to do so by --resolved flag.
409 git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
410 <"$dotest/$msgnum" >"$dotest/info" ||
413 # skip pine's internal folder data
414 grep '^Author: Mail System Internal Data$' \
415 <"$dotest"/info >/dev/null &&
418 test -s "$dotest/patch" || {
419 echo "Patch is empty. Was it split wrong?"
422 if test -f "$dotest/rebasing" &&
423 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
424 -e q "$dotest/$msgnum") &&
425 test "$(git cat-file -t "$commit")" = commit
427 git cat-file commit "$commit" |
428 sed -e '1,/^$/d' >"$dotest/msg-clean"
430 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
431 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
433 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
434 git stripspace > "$dotest/msg-clean"
439 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
440 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
441 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
443 if test -z "$GIT_AUTHOR_EMAIL"
445 echo "Patch does not have a valid e-mail address."
449 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
453 if test '' != "$SIGNOFF"
456 sed -ne '/^Signed-off-by: /p' \
457 "$dotest/msg-clean" |
461 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
462 test '' = "$LAST_SIGNED_OFF_BY" && echo
469 if test -s "$dotest/msg-clean"
471 cat "$dotest/msg-clean"
473 if test '' != "$ADD_SIGNOFF"
477 } >"$dotest/final-commit"
480 case "$resolved$interactive" in
482 # This is used only for interactive view option.
483 git diff-index -p --cached HEAD -- >"$dotest/patch"
489 if test "$interactive" = t
492 die "cannot be interactive without stdin connected to a terminal."
494 while test "$action" = again
496 echo "Commit Body is:"
497 echo "--------------------------"
498 cat "$dotest/final-commit"
499 echo "--------------------------"
500 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
504 [aA]*) action=yes interactive= ;;
505 [nN]*) action=skip ;;
506 [eE]*) git_editor "$dotest/final-commit"
509 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
516 FIRSTLINE=$(sed 1q "$dotest/final-commit")
518 if test $action = skip
524 if test -x "$GIT_DIR"/hooks/applypatch-msg
526 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
530 printf 'Applying: %s\n' "$FIRSTLINE"
534 eval 'git apply '"$git_apply_opt"' --index "$dotest/patch"'
538 # Resolved means the user did all the hard work, and
539 # we do not have to do any patch application. Just
540 # trust what the user has in the index file and the
543 git diff-index --quiet --cached HEAD -- && {
544 echo "No changes - did you forget to use 'git add'?"
545 stop_here_user_resolve $this
547 unmerged=$(git ls-files -u)
548 if test -n "$unmerged"
550 echo "You still have unmerged paths in your index"
551 echo "did you forget to use 'git add'?"
552 stop_here_user_resolve $this
559 if test $apply_status = 1 && test "$threeway" = t
563 # Applying the patch to an earlier tree and merging the
564 # result may have produced the same tree as ours.
565 git diff-index --quiet --cached HEAD -- && {
566 echo No changes -- Patch already applied.
570 # clear apply_status -- we have successfully merged.
574 if test $apply_status != 0
576 printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
577 stop_here_user_resolve $this
580 if test -x "$GIT_DIR"/hooks/pre-applypatch
582 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
585 tree=$(git write-tree) &&
587 if test -n "$ignore_date"
591 parent=$(git rev-parse --verify -q HEAD) ||
592 echo >&2 "applying to an empty history"
594 if test -n "$committer_date_is_author_date"
596 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
597 export GIT_COMMITTER_DATE
599 git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
601 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
604 if test -x "$GIT_DIR"/hooks/post-applypatch
606 "$GIT_DIR"/hooks/post-applypatch