5 USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
6 or, when resuming [--skip | --resolved]'
10 echo "$1" >"$dotest/next"
15 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
16 "$dotest/patch" "$dotest/info"
17 echo "$next" >"$dotest/next"
22 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
24 rm -fr "$dotest"/patch-merge-*
25 mkdir "$dotest/patch-merge-tmp-dir"
27 # First see if the patch records the index info that we can use.
28 if git-apply -z --index-info "$dotest/patch" \
29 >"$dotest/patch-merge-index-info" 2>/dev/null &&
30 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
31 git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
32 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
33 git-write-tree >"$dotest/patch-merge-base+" &&
34 # index has the base tree now.
36 cd "$dotest/patch-merge-tmp-dir" &&
37 GIT_INDEX_FILE="../patch-merge-tmp-index" \
38 GIT_OBJECT_DIRECTORY="$O_OBJECT" \
39 git-apply $binary --index <../patch
42 echo Using index info to reconstruct a base tree...
43 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
44 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
46 # Otherwise, try nearby trees that can be used to apply the
51 # Hoping the patch is against our recent commits...
52 git-rev-list --max-count=$N HEAD
54 # or hoping the patch is against known tags...
55 git-ls-remote --tags .
59 # See if we have it as a tree...
60 git-cat-file tree "$base" >/dev/null 2>&1 || continue
62 rm -fr "$dotest"/patch-merge-* &&
63 mkdir "$dotest/patch-merge-tmp-dir" || break
65 cd "$dotest/patch-merge-tmp-dir" &&
66 GIT_INDEX_FILE=../patch-merge-tmp-index &&
67 GIT_OBJECT_DIRECTORY="$O_OBJECT" &&
68 export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY &&
69 git-read-tree "$base" &&
70 git-apply $binary --index &&
71 mv ../patch-merge-tmp-index ../patch-merge-index &&
72 echo "$base" >../patch-merge-base
73 ) <"$dotest/patch" 2>/dev/null && break
77 test -f "$dotest/patch-merge-index" &&
78 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) &&
79 orig_tree=$(cat "$dotest/patch-merge-base") &&
80 rm -fr "$dotest"/patch-merge-* || exit 1
82 echo Falling back to patching base and 3-way merge...
84 # This is not so wrong. Depending on which base we picked,
85 # orig_tree may be wildly different from ours, but his_tree
86 # has the same set of wildly different changes in parts the
87 # patch did not touch, so resolve ends up cancelling them,
88 # saying that we reverted all those changes.
90 git-merge-resolve $orig_tree -- HEAD $his_tree || {
91 if test -d "$GIT_DIR/rr-cache"
95 echo Failed to merge in the changes.
101 dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary=
103 while case "$#" in 0) break;; esac
106 -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
107 dotest=`expr "$1" : '-[^=]*=\(.*\)'`; shift ;;
108 -d|--d|--do|--dot|--dote|--dotes|--dotest)
109 case "$#" in 1) usage ;; esac; shift
112 -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
113 --interacti|--interactiv|--interactive)
114 interactive=t; shift ;;
116 -b|--b|--bi|--bin|--bina|--binar|--binary)
119 -3|--3|--3w|--3wa|--3way)
121 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
123 -u|--u|--ut|--utf|--utf8)
125 -k|--k|--ke|--kee|--keep)
128 -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved)
143 # If the dotest directory exists, but we have finished applying all the
144 # patches in them, clear it out.
145 if test -d "$dotest" &&
146 last=$(cat "$dotest/last") &&
147 next=$(cat "$dotest/next") &&
149 test "$next" -gt "$last"
156 test ",$#," = ",0," ||
157 die "previous dotest directory $dotest still exists but mbox given."
160 # Make sure we are not given --skip nor --resolved
161 test ",$skip,$resolved," = ,,, ||
162 die "we are not resuming."
165 mkdir -p "$dotest" || exit
167 git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
172 # -b, -s, -u and -k flags are kept for the resuming session after
174 # -3 and -i can and must be given when resuming.
175 echo "$binary" >"$dotest/binary"
176 echo "$sign" >"$dotest/sign"
177 echo "$utf8" >"$dotest/utf8"
178 echo "$keep" >"$dotest/keep"
179 echo 1 >"$dotest/next"
184 files=$(git-diff-index --cached --name-only HEAD) || exit
185 if [ "$files" ]; then
186 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
191 if test "$(cat "$dotest/binary")" = t
193 binary=--allow-binary-replacement
195 if test "$(cat "$dotest/utf8")" = t
199 if test "$(cat "$dotest/keep")" = t
203 if test "$(cat "$dotest/sign")" = t
205 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
207 s/^/Signed-off-by: /'
213 last=`cat "$dotest/last"`
214 this=`cat "$dotest/next"`
217 this=`expr "$this" + 1`
221 if test "$this" -gt "$last"
228 while test "$this" -le "$last"
230 msgnum=`printf "%0${prec}d" $this`
231 next=`expr "$this" + 1`
232 test -f "$dotest/$msgnum" || {
238 # If we are not resuming, parse and extract the patch information
239 # into separate files:
240 # - info records the authorship and title
241 # - msg is the rest of commit log message
242 # - patch is the patch body.
244 # When we are resuming, these files are either already prepared
245 # by the user, or the user can tell us to do so by --resolved flag.
248 git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
249 <"$dotest/$msgnum" >"$dotest/info" ||
251 git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
255 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
256 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
257 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
259 if test -z "$GIT_AUTHOR_EMAIL"
261 echo "Patch does not have a valid e-mail address."
265 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
267 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
268 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
272 if test '' != "$SIGNOFF"
275 sed -ne '/^Signed-off-by: /p' \
276 "$dotest/msg-clean" |
280 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
281 test '' = "$LAST_SIGNED_OFF_BY" && echo
289 if test -s "$dotest/msg-clean"
292 cat "$dotest/msg-clean"
294 if test '' != "$ADD_SIGNOFF"
298 } >"$dotest/final-commit"
301 case "$resolved,$interactive" in
303 # This is used only for interactive view option.
304 git-diff-index -p --cached HEAD >"$dotest/patch"
310 if test "$interactive" = t
313 die "cannot be interactive without stdin connected to a terminal."
315 while test "$action" = again
317 echo "Commit Body is:"
318 echo "--------------------------"
319 cat "$dotest/final-commit"
320 echo "--------------------------"
321 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
325 [aA]*) action=yes interactive= ;;
326 [nN]*) action=skip ;;
327 [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
330 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
338 if test $action = skip
344 if test -x "$GIT_DIR"/hooks/applypatch-msg
346 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
351 echo "Applying '$SUBJECT'"
356 git-apply $binary --index "$dotest/patch"
360 # Resolved means the user did all the hard work, and
361 # we do not have to do any patch application. Just
362 # trust what the user has in the index file and the
369 if test $apply_status = 1 && test "$threeway" = t
373 # Applying the patch to an earlier tree and merging the
374 # result may have produced the same tree as ours.
375 changed="$(git-diff-index --cached --name-only -z HEAD)"
376 if test '' = "$changed"
378 echo No changes -- Patch already applied.
382 # clear apply_status -- we have successfully merged.
386 if test $apply_status != 0
388 echo Patch failed at $msgnum.
392 if test -x "$GIT_DIR"/hooks/pre-applypatch
394 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
397 tree=$(git-write-tree) &&
398 echo Wrote tree $tree &&
399 parent=$(git-rev-parse --verify HEAD) &&
400 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
401 echo Committed: $commit &&
402 git-update-ref HEAD $commit $parent ||
405 if test -x "$GIT_DIR"/hooks/post-applypatch
407 "$GIT_DIR"/hooks/post-applypatch