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 reject pass it through git-apply
22 resolvemsg= override error message when patch failure occurs
23 r,resolved to be used after a patch failure
24 skip skip the current patch
25 abort restore the original branch and abort the patching operation.
26 rebasing* (internal use for git-rebase)"
29 prefix=$(git rev-parse --show-prefix)
34 git var GIT_COMMITTER_IDENT >/dev/null ||
35 die "You need to set your committer info first"
40 printf "%s" "$sqarg" |
41 sed -e 's/'\''/'\''\\'\'''\''/g' -e 's/.*/ '\''&'\''/'
46 echo "$1" >"$dotest/next"
50 stop_here_user_resolve () {
51 if [ -n "$resolvemsg" ]; then
52 printf '%s\n' "$resolvemsg"
56 if test '' != "$interactive"
60 if test '' != "$threeway"
64 echo "When you have resolved this problem run \"$cmdline --resolved\"."
65 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
66 echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
72 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
73 "$dotest/patch" "$dotest/info"
74 echo "$next" >"$dotest/next"
80 echo "Cannot fall back to three-way merge."
85 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
87 rm -fr "$dotest"/patch-merge-*
88 mkdir "$dotest/patch-merge-tmp-dir"
90 # First see if the patch records the index info that we can use.
91 git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
93 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
94 git write-tree >"$dotest/patch-merge-base+" ||
95 cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
97 echo Using index info to reconstruct a base tree...
98 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
99 git apply --cached <"$dotest/patch"
101 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
102 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
104 cannot_fallback "Did you hand edit your patch?
105 It does not apply to blobs recorded in its index."
108 test -f "$dotest/patch-merge-index" &&
109 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
110 orig_tree=$(cat "$dotest/patch-merge-base") &&
111 rm -fr "$dotest"/patch-merge-* || exit 1
113 echo Falling back to patching base and 3-way merge...
115 # This is not so wrong. Depending on which base we picked,
116 # orig_tree may be wildly different from ours, but his_tree
117 # has the same set of wildly different changes in parts the
118 # patch did not touch, so recursive ends up canceling them,
119 # saying that we reverted all those changes.
121 eval GITHEAD_$his_tree='"$FIRSTLINE"'
122 export GITHEAD_$his_tree
123 git-merge-recursive $orig_tree -- HEAD $his_tree || {
125 echo Failed to merge in the changes.
128 unset GITHEAD_$his_tree
132 dotest="$GIT_DIR/rebase-apply"
133 sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
149 utf8=t ;; # this is now default
161 rebasing=t threeway=t keep=t ;;
163 die "-d option is no longer supported. Do not use."
166 shift; resolvemsg=$1 ;;
167 --whitespace|--directory)
168 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
170 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
172 git_apply_opt="$git_apply_opt $1" ;;
181 # If the dotest directory exists, but we have finished applying all the
182 # patches in them, clear it out.
183 if test -d "$dotest" &&
184 last=$(cat "$dotest/last") &&
185 next=$(cat "$dotest/next") &&
187 test "$next" -gt "$last"
194 case "$#,$skip$resolved$abort" in
196 # Explicit resume command and we do not have file, so
200 # No file input but without resume parameters; catch
201 # user error to feed us a patch from standard input
202 # when there is already $dotest. This is somewhat
203 # unreliable -- stdin could be /dev/null for example
204 # and the caller did not intend to feed us a patch but
205 # wanted to continue unattended.
212 die "previous rebase directory $dotest still exists but mbox given."
215 case "$skip,$abort" in
218 git read-tree --reset -u HEAD HEAD
219 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
221 git update-ref ORIG_HEAD $orig_head
225 git read-tree --reset -u HEAD ORIG_HEAD
231 # Make sure we are not given --skip, --resolved, nor --abort
232 test "$skip$resolved$abort" = "" ||
233 die "Resolve operation not in progress, we are not resuming."
236 mkdir -p "$dotest" || exit
238 if test -n "$prefix" && test $# != 0
243 test -n "$first" && {
251 set "$@" "$prefix$arg" ;;
256 git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
261 # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
262 # for the resuming session after a patch failure.
263 # -i can and must be given when resuming.
264 echo " $git_apply_opt" >"$dotest/apply-opt"
265 echo "$threeway" >"$dotest/threeway"
266 echo "$sign" >"$dotest/sign"
267 echo "$utf8" >"$dotest/utf8"
268 echo "$keep" >"$dotest/keep"
269 echo 1 >"$dotest/next"
270 if test -n "$rebasing"
272 : >"$dotest/rebasing"
274 : >"$dotest/applying"
275 git update-ref ORIG_HEAD HEAD
281 files=$(git diff-index --cached --name-only HEAD --) || exit
282 test "$files" && die "Dirty index: cannot apply patches (dirty: $files)"
285 if test "$(cat "$dotest/utf8")" = t
291 if test "$(cat "$dotest/keep")" = t
295 if test "$(cat "$dotest/threeway")" = t
299 git_apply_opt=$(cat "$dotest/apply-opt")
300 if test "$(cat "$dotest/sign")" = t
302 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
304 s/^/Signed-off-by: /'
310 last=`cat "$dotest/last"`
311 this=`cat "$dotest/next"`
314 this=`expr "$this" + 1`
318 if test "$this" -gt "$last"
325 while test "$this" -le "$last"
327 msgnum=`printf "%0${prec}d" $this`
328 next=`expr "$this" + 1`
329 test -f "$dotest/$msgnum" || {
335 # If we are not resuming, parse and extract the patch information
336 # into separate files:
337 # - info records the authorship and title
338 # - msg is the rest of commit log message
339 # - patch is the patch body.
341 # When we are resuming, these files are either already prepared
342 # by the user, or the user can tell us to do so by --resolved flag.
345 git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
346 <"$dotest/$msgnum" >"$dotest/info" ||
349 # skip pine's internal folder data
350 grep '^Author: Mail System Internal Data$' \
351 <"$dotest"/info >/dev/null &&
354 test -s "$dotest/patch" || {
355 echo "Patch is empty. Was it split wrong?"
358 if test -f "$dotest/rebasing" &&
359 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
360 -e q "$dotest/$msgnum") &&
361 test "$(git cat-file -t "$commit")" = commit
363 git cat-file commit "$commit" |
364 sed -e '1,/^$/d' >"$dotest/msg-clean"
366 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
367 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
369 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
370 git stripspace > "$dotest/msg-clean"
375 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
376 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
377 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
379 if test -z "$GIT_AUTHOR_EMAIL"
381 echo "Patch does not have a valid e-mail address."
385 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
389 if test '' != "$SIGNOFF"
392 sed -ne '/^Signed-off-by: /p' \
393 "$dotest/msg-clean" |
397 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
398 test '' = "$LAST_SIGNED_OFF_BY" && echo
405 if test -s "$dotest/msg-clean"
407 cat "$dotest/msg-clean"
409 if test '' != "$ADD_SIGNOFF"
413 } >"$dotest/final-commit"
416 case "$resolved$interactive" in
418 # This is used only for interactive view option.
419 git diff-index -p --cached HEAD -- >"$dotest/patch"
425 if test "$interactive" = t
428 die "cannot be interactive without stdin connected to a terminal."
430 while test "$action" = again
432 echo "Commit Body is:"
433 echo "--------------------------"
434 cat "$dotest/final-commit"
435 echo "--------------------------"
436 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
440 [aA]*) action=yes interactive= ;;
441 [nN]*) action=skip ;;
442 [eE]*) git_editor "$dotest/final-commit"
445 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
452 FIRSTLINE=$(sed 1q "$dotest/final-commit")
454 if test $action = skip
460 if test -x "$GIT_DIR"/hooks/applypatch-msg
462 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
466 printf 'Applying: %s\n' "$FIRSTLINE"
470 eval 'git apply '"$git_apply_opt"' --index "$dotest/patch"'
474 # Resolved means the user did all the hard work, and
475 # we do not have to do any patch application. Just
476 # trust what the user has in the index file and the
479 git diff-index --quiet --cached HEAD -- && {
480 echo "No changes - did you forget to use 'git add'?"
481 stop_here_user_resolve $this
483 unmerged=$(git ls-files -u)
484 if test -n "$unmerged"
486 echo "You still have unmerged paths in your index"
487 echo "did you forget to use 'git add'?"
488 stop_here_user_resolve $this
495 if test $apply_status = 1 && test "$threeway" = t
499 # Applying the patch to an earlier tree and merging the
500 # result may have produced the same tree as ours.
501 git diff-index --quiet --cached HEAD -- && {
502 echo No changes -- Patch already applied.
506 # clear apply_status -- we have successfully merged.
510 if test $apply_status != 0
512 printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
513 stop_here_user_resolve $this
516 if test -x "$GIT_DIR"/hooks/pre-applypatch
518 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
521 tree=$(git write-tree) &&
522 parent=$(git rev-parse --verify HEAD) &&
523 commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
524 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
527 if test -x "$GIT_DIR"/hooks/post-applypatch
529 "$GIT_DIR"/hooks/post-applypatch