3 # Copyright (c) 2005, 2006 Junio C Hamano
8 git-am [options] <mbox>|<Maildir>...
9 git-am [options] --resolved
10 git-am [options] --skip
12 d,dotest= (removed -- do not use)
13 i,interactive run interactively
14 b,binary pass --allow-binary-replacement to git-apply
15 3,3way allow fall back on 3way merging if needed
16 s,signoff add a Signed-off-by line to the commit message
17 u,utf8 recode into utf8 (default)
18 k,keep pass -k flag to git-mailinfo
19 whitespace= pass it through git-apply
20 C= pass it through git-apply
21 p= 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 rebasing (internal use for git-rebase)"
28 prefix
=$
(git rev-parse
--show-prefix)
33 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
36 echo "$1" >"$dotest/next"
40 stop_here_user_resolve
() {
41 if [ -n "$resolvemsg" ]; then
42 printf '%s\n' "$resolvemsg"
45 cmdline
=$
(basename $0)
46 if test '' != "$interactive"
50 if test '' != "$threeway"
54 echo "When you have resolved this problem run \"$cmdline --resolved\"."
55 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
61 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
62 "$dotest/patch" "$dotest/info"
63 echo "$next" >"$dotest/next"
69 echo "Cannot fall back to three-way merge."
74 O_OBJECT
=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
76 rm -fr "$dotest"/patch-merge-
*
77 mkdir
"$dotest/patch-merge-tmp-dir"
79 # First see if the patch records the index info that we can use.
80 git apply
--build-fake-ancestor "$dotest/patch-merge-tmp-index" \
82 GIT_INDEX_FILE
="$dotest/patch-merge-tmp-index" \
83 git write-tree
>"$dotest/patch-merge-base+" ||
84 cannot_fallback
"Repository lacks necessary blobs to fall back on 3-way merge."
86 echo Using index info to reconstruct a base tree...
87 if GIT_INDEX_FILE
="$dotest/patch-merge-tmp-index" \
88 git apply
$binary --cached <"$dotest/patch"
90 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
91 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
93 cannot_fallback
"Did you hand edit your patch?
94 It does not apply to blobs recorded in its index."
97 test -f "$dotest/patch-merge-index" &&
98 his_tree
=$
(GIT_INDEX_FILE
="$dotest/patch-merge-index" git write-tree
) &&
99 orig_tree
=$
(cat "$dotest/patch-merge-base") &&
100 rm -fr "$dotest"/patch-merge-
* ||
exit 1
102 echo Falling back to patching base and
3-way merge...
104 # This is not so wrong. Depending on which base we picked,
105 # orig_tree may be wildly different from ours, but his_tree
106 # has the same set of wildly different changes in parts the
107 # patch did not touch, so recursive ends up canceling them,
108 # saying that we reverted all those changes.
110 eval GITHEAD_
$his_tree='"$FIRSTLINE"'
111 export GITHEAD_
$his_tree
112 git-merge-recursive
$orig_tree -- HEAD
$his_tree ||
{
114 echo Failed to merge
in the changes.
117 unset GITHEAD_
$his_tree
122 sign
= utf8
=t keep
= skip
= interactive
= resolved
= binary
= rebasing
=
138 utf8
=t
;; # this is now default
148 rebasing
=t threeway
=t keep
=t binary
=t
;;
150 die
"-d option is no longer supported. Do not use."
153 shift; resolvemsg
=$1 ;;
155 git_apply_opt
="$git_apply_opt $1=$2"; shift ;;
157 git_apply_opt
="$git_apply_opt $1$2"; shift ;;
166 # If the dotest directory exists, but we have finished applying all the
167 # patches in them, clear it out.
168 if test -d "$dotest" &&
169 last
=$
(cat "$dotest/last") &&
170 next
=$
(cat "$dotest/next") &&
172 test "$next" -gt "$last"
179 case "$#,$skip$resolved" in
181 # Explicit resume command and we do not have file, so
185 # No file input but without resume parameters; catch
186 # user error to feed us a patch from standard input
187 # when there is already $dotest. This is somewhat
188 # unreliable -- stdin could be /dev/null for example
189 # and the caller did not intend to feed us a patch but
190 # wanted to continue unattended.
197 die
"previous dotest directory $dotest still exists but mbox given."
200 # Make sure we are not given --skip nor --resolved
201 test ",$skip,$resolved," = ,,, ||
202 die
"Resolve operation not in progress, we are not resuming."
205 mkdir
-p "$dotest" ||
exit
207 if test -n "$prefix" && test $# != 0
212 test -n "$first" && {
220 set "$@" "$prefix$arg" ;;
225 git mailsplit
-d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||
{
230 # -b, -s, -u, -k and --whitespace flags are kept for the
231 # resuming session after a patch failure.
232 # -3 and -i can and must be given when resuming.
233 echo "$binary" >"$dotest/binary"
234 echo " $ws" >"$dotest/whitespace"
235 echo "$sign" >"$dotest/sign"
236 echo "$utf8" >"$dotest/utf8"
237 echo "$keep" >"$dotest/keep"
238 echo 1 >"$dotest/next"
239 if test -n "$rebasing"
241 : >"$dotest/rebasing"
243 : >"$dotest/applying"
249 files
=$
(git diff-index
--cached --name-only HEAD
--) ||
exit
250 if [ "$files" ]; then
251 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
256 if test "$(cat "$dotest/binary
")" = t
258 binary
=--allow-binary-replacement
260 if test "$(cat "$dotest/utf8
")" = t
266 if test "$(cat "$dotest/keep
")" = t
270 ws
=`cat "$dotest/whitespace"`
271 if test "$(cat "$dotest/sign
")" = t
273 SIGNOFF
=`git-var GIT_COMMITTER_IDENT | sed -e '
275 s/^/Signed-off-by: /'
281 last
=`cat "$dotest/last"`
282 this
=`cat "$dotest/next"`
286 this
=`expr "$this" + 1`
290 if test "$this" -gt "$last"
297 while test "$this" -le "$last"
299 msgnum
=`printf "%0${prec}d" $this`
300 next
=`expr "$this" + 1`
301 test -f "$dotest/$msgnum" ||
{
307 # If we are not resuming, parse and extract the patch information
308 # into separate files:
309 # - info records the authorship and title
310 # - msg is the rest of commit log message
311 # - patch is the patch body.
313 # When we are resuming, these files are either already prepared
314 # by the user, or the user can tell us to do so by --resolved flag.
317 git mailinfo
$keep $utf8 "$dotest/msg" "$dotest/patch" \
318 <"$dotest/$msgnum" >"$dotest/info" ||
321 # skip pine's internal folder data
322 grep '^Author: Mail System Internal Data$' \
323 <"$dotest"/info
>/dev
/null
&&
326 test -s $dotest/patch ||
{
327 echo "Patch is empty. Was it split wrong?"
330 if test -f "$dotest/rebasing" &&
331 commit
=$
(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
332 -e q
"$dotest/$msgnum") &&
333 test "$(git cat-file -t "$commit")" = commit
335 git cat-file commit
"$commit" |
336 sed -e '1,/^$/d' >"$dotest/msg-clean"
338 SUBJECT
="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info
")"
339 case "$keep_subject" in -k) SUBJECT
="[PATCH] $SUBJECT" ;; esac
341 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
342 git stripspace
> "$dotest/msg-clean"
347 GIT_AUTHOR_NAME
="$(sed -n '/^Author/ s/Author: //p' "$dotest/info
")"
348 GIT_AUTHOR_EMAIL
="$(sed -n '/^Email/ s/Email: //p' "$dotest/info
")"
349 GIT_AUTHOR_DATE
="$(sed -n '/^Date/ s/Date: //p' "$dotest/info
")"
351 if test -z "$GIT_AUTHOR_EMAIL"
353 echo "Patch does not have a valid e-mail address."
357 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
361 if test '' != "$SIGNOFF"
364 sed -ne '/^Signed-off-by: /p' \
365 "$dotest/msg-clean" |
369 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
370 test '' = "$LAST_SIGNED_OFF_BY" && echo
377 if test -s "$dotest/msg-clean"
379 cat "$dotest/msg-clean"
381 if test '' != "$ADD_SIGNOFF"
385 } >"$dotest/final-commit"
388 case "$resolved$interactive" in
390 # This is used only for interactive view option.
391 git diff-index
-p --cached HEAD
-- >"$dotest/patch"
397 if test "$interactive" = t
400 die
"cannot be interactive without stdin connected to a terminal."
402 while test "$action" = again
404 echo "Commit Body is:"
405 echo "--------------------------"
406 cat "$dotest/final-commit"
407 echo "--------------------------"
408 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
412 [aA
]*) action
=yes interactive
= ;;
413 [nN
]*) action
=skip
;;
414 [eE
]*) git_editor
"$dotest/final-commit"
417 LESS
=-S ${PAGER:-less} "$dotest/patch" ;;
424 FIRSTLINE
=$
(sed 1q
"$dotest/final-commit")
426 if test $action = skip
432 if test -x "$GIT_DIR"/hooks
/applypatch-msg
434 "$GIT_DIR"/hooks
/applypatch-msg
"$dotest/final-commit" ||
438 printf 'Applying %s\n' "$FIRSTLINE"
442 git apply
$git_apply_opt $binary --index "$dotest/patch"
446 # Resolved means the user did all the hard work, and
447 # we do not have to do any patch application. Just
448 # trust what the user has in the index file and the
451 git diff-index
--quiet --cached HEAD
-- && {
452 echo "No changes - did you forget to use 'git add'?"
453 stop_here_user_resolve
$this
455 unmerged
=$
(git ls-files
-u)
456 if test -n "$unmerged"
458 echo "You still have unmerged paths in your index"
459 echo "did you forget to use 'git add'?"
460 stop_here_user_resolve
$this
467 if test $apply_status = 1 && test "$threeway" = t
471 # Applying the patch to an earlier tree and merging the
472 # result may have produced the same tree as ours.
473 git diff-index
--quiet --cached HEAD
-- && {
474 echo No changes
-- Patch already applied.
478 # clear apply_status -- we have successfully merged.
482 if test $apply_status != 0
484 echo Patch failed
at $msgnum.
485 stop_here_user_resolve
$this
488 if test -x "$GIT_DIR"/hooks
/pre-applypatch
490 "$GIT_DIR"/hooks
/pre-applypatch || stop_here
$this
493 tree
=$
(git write-tree
) &&
494 parent
=$
(git rev-parse
--verify HEAD
) &&
495 commit
=$
(git commit-tree
$tree -p $parent <"$dotest/final-commit") &&
496 git update-ref
-m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD
$commit $parent ||
499 if test -x "$GIT_DIR"/hooks
/post-applypatch
501 "$GIT_DIR"/hooks
/post-applypatch