blob: 9abad36abdea89c88d7d0378fd2d556057bc065b [file] [log] [blame]
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -07001#!/bin/sh
2#
Junio C Hamanod64e6b02006-02-18 20:51:26 -08003# Copyright (c) 2005, 2006 Junio C Hamano
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -07004
Jeff Kingc1491842008-03-01 01:22:55 -05005SUBDIRECTORY_OK=Yes
Pierre Habouzit78443d92007-11-04 11:30:57 +01006OPTIONS_KEEPDASHDASH=
7OPTIONS_SPEC="\
Štěpán Němec0adda932010-10-08 19:31:17 +02008git am [options] [(<mbox>|<Maildir>)...]
Stephan Beyer09f8d052008-07-25 20:22:23 +02009git am [options] (--resolved | --skip | --abort)
Pierre Habouzit78443d92007-11-04 11:30:57 +010010--
Junio C Hamano66006c62007-11-08 23:04:31 -080011i,interactive run interactively
Jay Soffian98ef23b2009-01-28 10:03:10 -050012b,binary* (historical option -- no-op)
Pierre Habouzit78443d92007-11-04 11:30:57 +0100133,3way allow fall back on 3way merging if needed
Stephen Boyd0e987a12009-06-16 15:33:01 -070014q,quiet be quiet
Pierre Habouzit78443d92007-11-04 11:30:57 +010015s,signoff add a Signed-off-by line to the commit message
16u,utf8 recode into utf8 (default)
Jörg Sommerfe1fa942008-02-03 00:58:06 +010017k,keep pass -k flag to git-mailinfo
Thomas Rastf7e5ea12012-01-16 11:53:00 +010018keep-non-patch pass -b flag to git-mailinfo
Stefan-W. Hahnad2c9282010-02-27 15:20:26 +010019keep-cr pass --keep-cr flag to git-mailsplit for mbox format
Stefan-W. Hahne80d4cb2010-02-27 15:20:27 +010020no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
Junio C Hamano017678b2009-08-26 21:36:05 -070021c,scissors strip everything before a scissors line
Pierre Habouzit78443d92007-11-04 11:30:57 +010022whitespace= pass it through git-apply
Giuseppe Bilotta86c91f92009-08-04 13:16:49 +020023ignore-space-change pass it through git-apply
24ignore-whitespace pass it through git-apply
Junio C Hamanob47dfe92009-01-11 22:21:48 -080025directory= pass it through git-apply
maximilian attems77e9e492011-08-03 11:37:29 +020026exclude= pass it through git-apply
Johannes Berg58725ef2012-03-28 13:11:28 +020027include= pass it through git-apply
Pierre Habouzit78443d92007-11-04 11:30:57 +010028C= pass it through git-apply
29p= pass it through git-apply
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +020030patch-format= format the patch(es) are in
martin f. krafftb80da422009-01-23 11:31:21 +110031reject pass it through git-apply
Pierre Habouzit78443d92007-11-04 11:30:57 +010032resolvemsg= override error message when patch failure occurs
Jeff Kingc8089af2010-02-11 17:27:14 -050033continue continue applying patches after resolving a conflict
34r,resolved synonyms for --continue
Junio C Hamano3041c322008-03-04 00:25:06 -080035skip skip the current patch
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +090036abort restore the original branch and abort the patching operation.
Junio C Hamano3f01ad62009-01-22 16:14:58 -080037committer-date-is-author-date lie about committer date
Nanako Shiraishia79ec622009-01-24 10:18:02 +090038ignore-date use current timestamp for author date
Junio C Hamanocb6020b2009-12-04 00:20:48 -080039rerere-autoupdate update the index with reused conflict resolution if possible
Jay Soffian98ef23b2009-01-28 10:03:10 -050040rebasing* (internal use for git-rebase)"
Pierre Habouzit78443d92007-11-04 11:30:57 +010041
freku045@student.liu.secf1fe882005-12-13 23:30:31 +010042. git-sh-setup
Ævar Arnfjörð Bjarmasonb9a97262011-05-21 18:43:42 +000043. git-sh-i18n
Junio C Hamanobb034f82008-03-04 00:25:04 -080044prefix=$(git rev-parse --show-prefix)
Shawn O. Pearcef9474132006-12-28 02:34:48 -050045set_reflog_action am
Shawn O. Pearce7eff28a2006-12-30 23:32:38 -050046require_work_tree
Jeff Kingc1491842008-03-01 01:22:55 -050047cd_to_toplevel
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -070048
Stephan Beyer460abee2008-07-12 17:46:59 +020049git var GIT_COMMITTER_IDENT >/dev/null ||
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +000050 die "$(gettext "You need to set your committer info first")"
Junio C Hamanod64e6b02006-02-18 20:51:26 -080051
Nanako Shiraishif79d4c82009-04-10 09:34:42 +090052if git rev-parse --verify -q HEAD >/dev/null
53then
54 HAS_HEAD=yes
55else
56 HAS_HEAD=
57fi
58
Ramkumar Ramachandrad2c46312010-06-02 10:33:35 +020059cmdline="git am"
60if test '' != "$interactive"
61then
62 cmdline="$cmdline -i"
63fi
64if test '' != "$threeway"
65then
66 cmdline="$cmdline -3"
67fi
68
Junio C Hamanob47dfe92009-01-11 22:21:48 -080069sq () {
Christian Couder47c97392009-04-24 08:29:01 +020070 git rev-parse --sq-quote "$@"
Junio C Hamanob47dfe92009-01-11 22:21:48 -080071}
72
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -070073stop_here () {
74 echo "$1" >"$dotest/next"
Junio C Hamano7b3b7e32010-12-21 10:35:53 -080075 git rev-parse --verify -q HEAD >"$dotest/abort-safety"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -070076 exit 1
77}
78
Junio C Hamano7b3b7e32010-12-21 10:35:53 -080079safe_to_abort () {
80 if test -f "$dotest/dirtyindex"
81 then
82 return 1
83 fi
84
85 if ! test -s "$dotest/abort-safety"
86 then
87 return 0
88 fi
89
90 abort_safety=$(cat "$dotest/abort-safety")
91 if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
92 then
93 return 0
94 fi
Jon Seymourde88c1c2011-08-07 21:58:14 +100095 gettextln "You seem to have moved HEAD since the last 'am' failure.
96Not rewinding to ORIG_HEAD" >&2
Junio C Hamano7b3b7e32010-12-21 10:35:53 -080097 return 1
98}
99
Robert Shearmanced94562006-05-02 13:32:43 +0100100stop_here_user_resolve () {
Seancc120052006-05-13 23:34:08 -0400101 if [ -n "$resolvemsg" ]; then
Jeff Kinga23bfae2007-05-26 00:33:03 -0700102 printf '%s\n' "$resolvemsg"
Seancc120052006-05-13 23:34:08 -0400103 stop_here $1
104 fi
Jon Seymourde88c1c2011-08-07 21:58:14 +1000105 eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
Ævar Arnfjörð Bjarmasona4372c32011-05-21 18:43:45 +0000106If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
Jon Seymourde88c1c2011-08-07 21:58:14 +1000107To restore the original branch and stop patching run \"\$cmdline --abort\"."
Robert Shearmanced94562006-05-02 13:32:43 +0100108
109 stop_here $1
110}
111
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700112go_next () {
113 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
114 "$dotest/patch" "$dotest/info"
115 echo "$next" >"$dotest/next"
116 this=$next
117}
118
Junio C Hamanofd7bcfb2006-08-12 16:16:47 -0700119cannot_fallback () {
120 echo "$1"
Jon Seymourde88c1c2011-08-07 21:58:14 +1000121 gettextln "Cannot fall back to three-way merge."
Junio C Hamanofd7bcfb2006-08-12 16:16:47 -0700122 exit 1
123}
124
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700125fall_back_3way () {
126 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
127
128 rm -fr "$dotest"/patch-merge-*
129 mkdir "$dotest/patch-merge-tmp-dir"
130
131 # First see if the patch records the index info that we can use.
Junio C Hamano4056afb2012-02-22 21:55:06 -0800132 cmd="git apply $git_apply_opt --build-fake-ancestor" &&
133 cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
134 eval "$cmd" &&
Junio C Hamanofd7bcfb2006-08-12 16:16:47 -0700135 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
Junio C Hamano5be60072007-07-02 22:52:14 -0700136 git write-tree >"$dotest/patch-merge-base+" ||
Ævar Arnfjörð Bjarmasona424ca12011-05-21 18:43:48 +0000137 cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
Junio C Hamanofd7bcfb2006-08-12 16:16:47 -0700138
Stephen Boyd0e987a12009-06-16 15:33:01 -0700139 say Using index info to reconstruct a base tree...
Junio C Hamano4056afb2012-02-22 21:55:06 -0800140
141 cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
Junio C Hamano5d868612012-03-28 09:55:21 -0700142
143 if test -z "$GIT_QUIET"
144 then
145 eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
146 fi
147
Junio C Hamano4056afb2012-02-22 21:55:06 -0800148 cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
149 if eval "$cmd"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700150 then
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700151 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
152 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
Junio C Hamanofd7bcfb2006-08-12 16:16:47 -0700153 else
Ævar Arnfjörð Bjarmasona424ca12011-05-21 18:43:48 +0000154 cannot_fallback "$(gettext "Did you hand edit your patch?
155It does not apply to blobs recorded in its index.")"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700156 fi
157
158 test -f "$dotest/patch-merge-index" &&
Junio C Hamano5be60072007-07-02 22:52:14 -0700159 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700160 orig_tree=$(cat "$dotest/patch-merge-base") &&
161 rm -fr "$dotest"/patch-merge-* || exit 1
162
Ævar Arnfjörð Bjarmason865207a2011-05-21 18:43:51 +0000163 say "$(gettext "Falling back to patching base and 3-way merge...")"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700164
165 # This is not so wrong. Depending on which base we picked,
166 # orig_tree may be wildly different from ours, but his_tree
167 # has the same set of wildly different changes in parts the
Shawn O. Pearce579c9bb2006-12-28 02:35:27 -0500168 # patch did not touch, so recursive ends up canceling them,
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700169 # saying that we reverted all those changes.
170
Linus Torvalds2e6e3e8292008-04-15 12:56:50 -0700171 eval GITHEAD_$his_tree='"$FIRSTLINE"'
Shawn O. Pearce579c9bb2006-12-28 02:35:27 -0500172 export GITHEAD_$his_tree
Stephen Boyd0e987a12009-06-16 15:33:01 -0700173 if test -n "$GIT_QUIET"
174 then
Junio C Hamano69ae92b2010-10-13 11:36:36 -0700175 GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
Stephen Boyd0e987a12009-06-16 15:33:01 -0700176 fi
Shawn O. Pearce579c9bb2006-12-28 02:35:27 -0500177 git-merge-recursive $orig_tree -- HEAD $his_tree || {
Junio C Hamanocb6020b2009-12-04 00:20:48 -0800178 git rerere $allow_rerere_autoupdate
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700179 echo Failed to merge in the changes.
180 exit 1
181 }
Shawn O. Pearce579c9bb2006-12-28 02:35:27 -0500182 unset GITHEAD_$his_tree
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700183}
184
Giuseppe Bilotta0cd29a02009-05-27 11:25:19 +0200185clean_abort () {
186 test $# = 0 || echo >&2 "$@"
187 rm -fr "$dotest"
188 exit 1
189}
190
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200191patch_format=
192
193check_patch_format () {
194 # early return if patch_format was set from the command line
195 if test -n "$patch_format"
196 then
197 return 0
198 fi
Giuseppe Bilotta15ced752009-05-27 23:20:12 +0200199
200 # we default to mbox format if input is from stdin and for
201 # directories
202 if test $# = 0 || test "x$1" = "x-" || test -d "$1"
203 then
204 patch_format=mbox
205 return 0
206 fi
207
David Barr0e8341f2011-08-08 04:49:04 +0200208 # otherwise, check the first few non-blank lines of the first
209 # patch to try to detect its format
Giuseppe Bilotta15ced752009-05-27 23:20:12 +0200210 {
David Barr0e8341f2011-08-08 04:49:04 +0200211 # Start from first line containing non-whitespace
212 l1=
213 while test -z "$l1"
214 do
Jim Meyeringf0c57932012-02-25 18:34:26 +0100215 read l1 || break
David Barr0e8341f2011-08-08 04:49:04 +0200216 done
Giuseppe Bilotta15ced752009-05-27 23:20:12 +0200217 read l2
218 read l3
219 case "$l1" in
220 "From "* | "From: "*)
221 patch_format=mbox
222 ;;
223 '# This series applies on GIT commit'*)
224 patch_format=stgit-series
225 ;;
226 "# HG changeset patch")
227 patch_format=hg
228 ;;
229 *)
230 # if the second line is empty and the third is
231 # a From, Author or Date entry, this is very
232 # likely an StGIT patch
233 case "$l2,$l3" in
234 ,"From: "* | ,"Author: "* | ,"Date: "*)
235 patch_format=stgit
236 ;;
237 *)
238 ;;
239 esac
240 ;;
241 esac
Junio C Hamano0fcb2ca2009-08-06 20:08:12 -0500242 if test -z "$patch_format" &&
243 test -n "$l1" &&
244 test -n "$l2" &&
245 test -n "$l3"
246 then
247 # This begins with three non-empty lines. Is this a
248 # piece of e-mail a-la RFC2822? Grab all the headers,
249 # discarding the indented remainder of folded lines,
250 # and see if it looks like that they all begin with the
251 # header field names...
Stephen Boyde3f67d32010-01-25 16:33:59 -0800252 tr -d '\015' <"$1" |
253 sed -n -e '/^$/q' -e '/^[ ]/d' -e p |
Junio C Hamanoe1622bf2009-11-23 15:56:32 -0800254 sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
Junio C Hamano0fcb2ca2009-08-06 20:08:12 -0500255 patch_format=mbox
256 fi
Giuseppe Bilotta0cd29a02009-05-27 11:25:19 +0200257 } < "$1" || clean_abort
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200258}
259
260split_patches () {
261 case "$patch_format" in
262 mbox)
Stefan-W. Hahne80d4cb2010-02-27 15:20:27 +0100263 if test -n "$rebasing" || test t = "$keepcr"
Stefan-W. Hahnad2c9282010-02-27 15:20:26 +0100264 then
265 keep_cr=--keep-cr
266 else
267 keep_cr=
268 fi
Junio C Hamanoc2ca1d72009-08-04 22:31:59 -0500269 git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
Giuseppe Bilotta0cd29a02009-05-27 11:25:19 +0200270 clean_abort
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200271 ;;
Giuseppe Bilottac574e682009-05-27 11:25:18 +0200272 stgit-series)
273 if test $# -ne 1
274 then
Ævar Arnfjörð Bjarmasond62a1462011-05-21 18:43:49 +0000275 clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
Giuseppe Bilottac574e682009-05-27 11:25:18 +0200276 fi
277 series_dir=`dirname "$1"`
278 series_file="$1"
279 shift
280 {
281 set x
282 while read filename
283 do
284 set "$@" "$series_dir/$filename"
285 done
286 # remove the safety x
287 shift
288 # remove the arg coming from the first-line comment
289 shift
Giuseppe Bilotta0cd29a02009-05-27 11:25:19 +0200290 } < "$series_file" || clean_abort
Giuseppe Bilottac574e682009-05-27 11:25:18 +0200291 # set the patch format appropriately
292 patch_format=stgit
293 # now handle the actual StGIT patches
294 split_patches "$@"
295 ;;
296 stgit)
297 this=0
298 for stgit in "$@"
299 do
300 this=`expr "$this" + 1`
301 msgnum=`printf "%0${prec}d" $this`
302 # Perl version of StGIT parse_patch. The first nonemptyline
303 # not starting with Author, From or Date is the
304 # subject, and the body starts with the next nonempty
305 # line not starting with Author, From or Date
306 perl -ne 'BEGIN { $subject = 0 }
307 if ($subject > 1) { print ; }
308 elsif (/^\s+$/) { next ; }
Giuseppe Bilotta45d51dc2011-08-29 18:44:07 +0200309 elsif (/^Author:/) { s/Author/From/ ; print ;}
Giuseppe Bilottac574e682009-05-27 11:25:18 +0200310 elsif (/^(From|Date)/) { print ; }
311 elsif ($subject) {
312 $subject = 2 ;
313 print "\n" ;
314 print ;
315 } else {
316 print "Subject: ", $_ ;
317 $subject = 1;
318 }
Giuseppe Bilotta0cd29a02009-05-27 11:25:19 +0200319 ' < "$stgit" > "$dotest/$msgnum" || clean_abort
Giuseppe Bilottac574e682009-05-27 11:25:18 +0200320 done
321 echo "$this" > "$dotest/last"
322 this=
323 msgnum=
324 ;;
Giuseppe Bilotta0cfd1122011-08-29 18:44:06 +0200325 hg)
326 this=0
327 for hg in "$@"
328 do
329 this=$(( $this + 1 ))
330 msgnum=$(printf "%0${prec}d" $this)
331 # hg stores changeset metadata in #-commented lines preceding
332 # the commit message and diff(s). The only metadata we care about
333 # are the User and Date (Node ID and Parent are hashes which are
334 # only relevant to the hg repository and thus not useful to us)
335 # Since we cannot guarantee that the commit message is in
336 # git-friendly format, we put no Subject: line and just consume
337 # all of the message as the body
338 perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
339 if ($subject) { print ; }
340 elsif (/^\# User /) { s/\# User/From:/ ; print ; }
341 elsif (/^\# Date /) {
342 my ($hashsign, $str, $time, $tz) = split ;
343 $tz = sprintf "%+05d", (0-$tz)/36;
344 print "Date: " .
345 strftime("%a, %d %b %Y %H:%M:%S ",
346 localtime($time))
347 . "$tz\n";
348 } elsif (/^\# /) { next ; }
349 else {
350 print "\n", $_ ;
351 $subject = 1;
352 }
353 ' <"$hg" >"$dotest/$msgnum" || clean_abort
354 done
355 echo "$this" >"$dotest/last"
356 this=
357 msgnum=
358 ;;
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200359 *)
Giuseppe Bilottadff4b0e2011-08-29 17:22:06 +0200360 if test -n "$patch_format"
361 then
Ævar Arnfjörð Bjarmasond62a1462011-05-21 18:43:49 +0000362 clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
Nicolas Sebrecht46caf502009-08-06 20:08:13 -0500363 else
Ævar Arnfjörð Bjarmasond62a1462011-05-21 18:43:49 +0000364 clean_abort "$(gettext "Patch format detection failed.")"
Nicolas Sebrecht46caf502009-08-06 20:08:13 -0500365 fi
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200366 ;;
367 esac
368}
369
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700370prec=4
Johannes Schindelin51ef1da2008-07-21 12:51:02 +0200371dotest="$GIT_DIR/rebase-apply"
Stefan-W. Hahnad2c9282010-02-27 15:20:26 +0100372sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
Lukas Sandströmd25e5152009-11-20 17:12:47 +0100373resolvemsg= resume= scissors= no_inbody_headers=
Michael S. Tsirkin67dad682007-02-08 15:57:08 +0200374git_apply_opt=
Junio C Hamano3f01ad62009-01-22 16:14:58 -0800375committer_date_is_author_date=
Nanako Shiraishia79ec622009-01-24 10:18:02 +0900376ignore_date=
Junio C Hamanocb6020b2009-12-04 00:20:48 -0800377allow_rerere_autoupdate=
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700378
Stefan-W. Hahne80d4cb2010-02-27 15:20:27 +0100379if test "$(git config --bool --get am.keepcr)" = true
380then
381 keepcr=t
382fi
383
David Kastrup822f7c72007-09-23 22:42:08 +0200384while test $# != 0
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700385do
386 case "$1" in
Pierre Habouzit78443d92007-11-04 11:30:57 +0100387 -i|--interactive)
388 interactive=t ;;
389 -b|--binary)
Junio C Hamano6c15a1c2012-03-13 11:38:27 -0700390 echo >&2 "The $1 option has been a no-op for long time, and"
391 echo >&2 "it will be removed. Please do not use it anymore."
Thomas Rast4eeb1de2012-03-12 22:47:19 +0100392 ;;
Pierre Habouzit78443d92007-11-04 11:30:57 +0100393 -3|--3way)
394 threeway=t ;;
Johannes Sixtdfdd7e62007-11-06 21:33:58 +0100395 -s|--signoff)
Pierre Habouzit78443d92007-11-04 11:30:57 +0100396 sign=t ;;
397 -u|--utf8)
398 utf8=t ;; # this is now default
399 --no-utf8)
400 utf8= ;;
401 -k|--keep)
402 keep=t ;;
Thomas Rastf7e5ea12012-01-16 11:53:00 +0100403 --keep-non-patch)
404 keep=b ;;
Junio C Hamano017678b2009-08-26 21:36:05 -0700405 -c|--scissors)
406 scissors=t ;;
407 --no-scissors)
408 scissors=f ;;
Jeff Kingc8089af2010-02-11 17:27:14 -0500409 -r|--resolved|--continue)
Pierre Habouzit78443d92007-11-04 11:30:57 +0100410 resolved=t ;;
411 --skip)
412 skip=t ;;
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900413 --abort)
414 abort=t ;;
Junio C Hamano3041c322008-03-04 00:25:06 -0800415 --rebasing)
Lukas Sandströmd25e5152009-11-20 17:12:47 +0100416 rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
Pierre Habouzit78443d92007-11-04 11:30:57 +0100417 -d|--dotest)
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000418 die "$(gettext "-d option is no longer supported. Do not use.")"
Junio C Hamanoe72c7402008-03-04 00:25:05 -0800419 ;;
Pierre Habouzit78443d92007-11-04 11:30:57 +0100420 --resolvemsg)
421 shift; resolvemsg=$1 ;;
Johannes Berg58725ef2012-03-28 13:11:28 +0200422 --whitespace|--directory|--exclude|--include)
Junio C Hamanob47dfe92009-01-11 22:21:48 -0800423 git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
Pierre Habouzit78443d92007-11-04 11:30:57 +0100424 -C|-p)
Junio C Hamanob47dfe92009-01-11 22:21:48 -0800425 git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200426 --patch-format)
427 shift ; patch_format="$1" ;;
Giuseppe Bilotta86c91f92009-08-04 13:16:49 +0200428 --reject|--ignore-whitespace|--ignore-space-change)
martin f. krafftb80da422009-01-23 11:31:21 +1100429 git_apply_opt="$git_apply_opt $1" ;;
Junio C Hamano3f01ad62009-01-22 16:14:58 -0800430 --committer-date-is-author-date)
431 committer_date_is_author_date=t ;;
Nanako Shiraishia79ec622009-01-24 10:18:02 +0900432 --ignore-date)
433 ignore_date=t ;;
Junio C Hamanocb6020b2009-12-04 00:20:48 -0800434 --rerere-autoupdate|--no-rerere-autoupdate)
435 allow_rerere_autoupdate="$1" ;;
Stephen Boyd0e987a12009-06-16 15:33:01 -0700436 -q|--quiet)
437 GIT_QUIET=t ;;
Stefan-W. Hahnad2c9282010-02-27 15:20:26 +0100438 --keep-cr)
439 keepcr=t ;;
Stefan-W. Hahne80d4cb2010-02-27 15:20:27 +0100440 --no-keep-cr)
441 keepcr=f ;;
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700442 --)
Pierre Habouzit78443d92007-11-04 11:30:57 +0100443 shift; break ;;
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700444 *)
Pierre Habouzit78443d92007-11-04 11:30:57 +0100445 usage ;;
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700446 esac
Pierre Habouzit78443d92007-11-04 11:30:57 +0100447 shift
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700448done
449
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800450# If the dotest directory exists, but we have finished applying all the
451# patches in them, clear it out.
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700452if test -d "$dotest" &&
453 last=$(cat "$dotest/last") &&
454 next=$(cat "$dotest/next") &&
455 test $# != 0 &&
456 test "$next" -gt "$last"
457then
458 rm -fr "$dotest"
459fi
460
461if test -d "$dotest"
462then
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900463 case "$#,$skip$resolved$abort" in
Junio C Hamanoc95b1382006-09-15 23:19:02 -0700464 0,*t*)
465 # Explicit resume command and we do not have file, so
466 # we are happy.
467 : ;;
468 0,)
469 # No file input but without resume parameters; catch
470 # user error to feed us a patch from standard input
Junio C Hamanoe72c7402008-03-04 00:25:05 -0800471 # when there is already $dotest. This is somewhat
Junio C Hamanoc95b1382006-09-15 23:19:02 -0700472 # unreliable -- stdin could be /dev/null for example
473 # and the caller did not intend to feed us a patch but
474 # wanted to continue unattended.
Jay Soffian98ef23b2009-01-28 10:03:10 -0500475 test -t 0
Junio C Hamanoc95b1382006-09-15 23:19:02 -0700476 ;;
477 *)
478 false
479 ;;
480 esac ||
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000481 die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
Junio C Hamano271440e2005-10-25 23:35:37 -0700482 resume=yes
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900483
Olivier Marin95f8ebb2008-07-21 15:39:06 +0200484 case "$skip,$abort" in
Junio C Hamano2d56a132009-02-26 11:24:29 -0800485 t,t)
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000486 die "$(gettext "Please make up your mind. --skip or --abort?")"
Junio C Hamano2d56a132009-02-26 11:24:29 -0800487 ;;
Olivier Marin95f8ebb2008-07-21 15:39:06 +0200488 t,)
489 git rerere clear
490 git read-tree --reset -u HEAD HEAD
491 orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
492 git reset HEAD
493 git update-ref ORIG_HEAD $orig_head
494 ;;
495 ,t)
Junio C Hamano2d56a132009-02-26 11:24:29 -0800496 if test -f "$dotest/rebasing"
497 then
498 exec git rebase --abort
499 fi
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900500 git rerere clear
Junio C Hamano7b3b7e32010-12-21 10:35:53 -0800501 if safe_to_abort
502 then
Michael J Gruberc7671842009-02-26 10:52:53 +0100503 git read-tree --reset -u HEAD ORIG_HEAD
504 git reset ORIG_HEAD
Junio C Hamano7b3b7e32010-12-21 10:35:53 -0800505 fi
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900506 rm -fr "$dotest"
507 exit ;;
508 esac
Michael J Gruberc7671842009-02-26 10:52:53 +0100509 rm -f "$dotest/dirtyindex"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700510else
Nanako Shiraishi3e5057a2008-07-16 19:39:10 +0900511 # Make sure we are not given --skip, --resolved, nor --abort
512 test "$skip$resolved$abort" = "" ||
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000513 die "$(gettext "Resolve operation not in progress, we are not resuming.")"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700514
515 # Start afresh.
516 mkdir -p "$dotest" || exit
517
Junio C Hamanobb034f82008-03-04 00:25:04 -0800518 if test -n "$prefix" && test $# != 0
519 then
520 first=t
521 for arg
522 do
523 test -n "$first" && {
524 set x
525 first=
526 }
Pat Thoyts5e9677c2010-09-30 14:24:07 +0100527 if is_absolute_path "$arg"
528 then
529 set "$@" "$arg"
530 else
531 set "$@" "$prefix$arg"
532 fi
Junio C Hamanobb034f82008-03-04 00:25:04 -0800533 done
534 shift
535 fi
Giuseppe Bilottaa5a67552009-05-27 11:25:16 +0200536
537 check_patch_format "$@"
538
539 split_patches "$@"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700540
Junio C Hamano017678b2009-08-26 21:36:05 -0700541 # -i can and must be given when resuming; everything
542 # else is kept
Junio C Hamano9b9f5a22008-12-05 11:19:43 -0800543 echo " $git_apply_opt" >"$dotest/apply-opt"
Junio C Hamano22db2402008-12-04 15:38:27 -0800544 echo "$threeway" >"$dotest/threeway"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700545 echo "$sign" >"$dotest/sign"
546 echo "$utf8" >"$dotest/utf8"
547 echo "$keep" >"$dotest/keep"
Junio C Hamano017678b2009-08-26 21:36:05 -0700548 echo "$scissors" >"$dotest/scissors"
Lukas Sandströmd25e5152009-11-20 17:12:47 +0100549 echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
Stephen Boyd0e987a12009-06-16 15:33:01 -0700550 echo "$GIT_QUIET" >"$dotest/quiet"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700551 echo 1 >"$dotest/next"
Junio C Hamano3041c322008-03-04 00:25:06 -0800552 if test -n "$rebasing"
553 then
554 : >"$dotest/rebasing"
555 else
556 : >"$dotest/applying"
Nanako Shiraishif79d4c82009-04-10 09:34:42 +0900557 if test -n "$HAS_HEAD"
558 then
559 git update-ref ORIG_HEAD HEAD
560 else
561 git update-ref -d ORIG_HEAD >/dev/null 2>&1
562 fi
Junio C Hamano3041c322008-03-04 00:25:06 -0800563 fi
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700564fi
565
Jeff King2a6f08a2011-08-15 17:13:07 -0700566git update-index -q --refresh
567
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800568case "$resolved" in
569'')
Nanako Shiraishif79d4c82009-04-10 09:34:42 +0900570 case "$HAS_HEAD" in
571 '')
572 files=$(git ls-files) ;;
573 ?*)
574 files=$(git diff-index --cached --name-only HEAD --) ;;
575 esac || exit
Michael J Gruberc7671842009-02-26 10:52:53 +0100576 if test "$files"
577 then
Nanako Shiraishif79d4c82009-04-10 09:34:42 +0900578 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000579 die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
Michael J Gruberc7671842009-02-26 10:52:53 +0100580 fi
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800581esac
582
Thomas Rastf7e5ea12012-01-16 11:53:00 +0100583# Now, decide what command line options we will give to the git
584# commands we invoke, based on the result of parsing command line
585# options and previous invocation state stored in $dotest/ files.
586
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700587if test "$(cat "$dotest/utf8")" = t
588then
589 utf8=-u
Junio C Hamanobb1091a2007-01-09 21:31:36 -0800590else
591 utf8=-n
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700592fi
Thomas Rastf7e5ea12012-01-16 11:53:00 +0100593keep=$(cat "$dotest/keep")
594case "$keep" in
595t)
596 keep=-k ;;
597b)
598 keep=-b ;;
599*)
600 keep= ;;
601esac
Junio C Hamano017678b2009-08-26 21:36:05 -0700602case "$(cat "$dotest/scissors")" in
603t)
604 scissors=--scissors ;;
605f)
606 scissors=--no-scissors ;;
607esac
Lukas Sandströmd25e5152009-11-20 17:12:47 +0100608if test "$(cat "$dotest/no_inbody_headers")" = t
609then
610 no_inbody_headers=--no-inbody-headers
611else
612 no_inbody_headers=
613fi
Stephen Boyd0e987a12009-06-16 15:33:01 -0700614if test "$(cat "$dotest/quiet")" = t
615then
616 GIT_QUIET=t
617fi
Junio C Hamano22db2402008-12-04 15:38:27 -0800618if test "$(cat "$dotest/threeway")" = t
619then
620 threeway=t
621fi
Junio C Hamano9b9f5a22008-12-05 11:19:43 -0800622git_apply_opt=$(cat "$dotest/apply-opt")
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700623if test "$(cat "$dotest/sign")" = t
624then
Todd Zullinger5354a562008-07-30 13:48:33 -0400625 SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700626 s/>.*/>/
627 s/^/Signed-off-by: /'
628 `
629else
630 SIGNOFF=
631fi
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700632
633last=`cat "$dotest/last"`
634this=`cat "$dotest/next"`
635if test "$skip" = t
636then
637 this=`expr "$this" + 1`
Jan Harkes69224712005-12-17 01:01:06 -0500638 resume=
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700639fi
640
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700641while test "$this" -le "$last"
642do
643 msgnum=`printf "%0${prec}d" $this`
644 next=`expr "$this" + 1`
645 test -f "$dotest/$msgnum" || {
Jan Harkes69224712005-12-17 01:01:06 -0500646 resume=
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700647 go_next
648 continue
649 }
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800650
651 # If we are not resuming, parse and extract the patch information
652 # into separate files:
653 # - info records the authorship and title
654 # - msg is the rest of commit log message
655 # - patch is the patch body.
656 #
657 # When we are resuming, these files are either already prepared
658 # by the user, or the user can tell us to do so by --resolved flag.
Junio C Hamano271440e2005-10-25 23:35:37 -0700659 case "$resume" in
660 '')
Lukas Sandströmd25e5152009-11-20 17:12:47 +0100661 git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
Junio C Hamano271440e2005-10-25 23:35:37 -0700662 <"$dotest/$msgnum" >"$dotest/info" ||
663 stop_here $this
Johannes Schindelinca193cf2007-07-24 01:02:25 +0100664
665 # skip pine's internal folder data
Junio C Hamanoe1622bf2009-11-23 15:56:32 -0800666 sane_grep '^Author: Mail System Internal Data$' \
Johannes Schindelinca193cf2007-07-24 01:02:25 +0100667 <"$dotest"/info >/dev/null &&
668 go_next && continue
669
Johannes Schindelin28ed6e72008-07-16 03:33:44 +0200670 test -s "$dotest/patch" || {
Jon Seymourde88c1c2011-08-07 21:58:14 +1000671 eval_gettextln "Patch is empty. Was it split wrong?
Ævar Arnfjörð Bjarmasona4372c32011-05-21 18:43:45 +0000672If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
Jon Seymourde88c1c2011-08-07 21:58:14 +1000673To restore the original branch and stop patching run \"\$cmdline --abort\"."
Don Zickus87ab7992007-03-12 15:52:04 -0400674 stop_here $this
675 }
Jay Soffian43c23252010-06-16 03:12:40 -0400676 rm -f "$dotest/original-commit" "$dotest/author-script"
Junio C Hamano5e835ca2008-04-16 12:50:48 -0700677 if test -f "$dotest/rebasing" &&
678 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
679 -e q "$dotest/$msgnum") &&
680 test "$(git cat-file -t "$commit")" = commit
681 then
682 git cat-file commit "$commit" |
683 sed -e '1,/^$/d' >"$dotest/msg-clean"
Thomas Rast96e19482010-03-12 18:04:29 +0100684 echo "$commit" > "$dotest/original-commit"
Jay Soffian43c23252010-06-16 03:12:40 -0400685 get_author_ident_from_commit "$commit" > "$dotest/author-script"
Junio C Hamano5e835ca2008-04-16 12:50:48 -0700686 else
Junio C Hamanoc970a6f2009-11-27 15:06:37 -0800687 {
688 sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
689 echo
690 cat "$dotest/msg"
691 } |
692 git stripspace > "$dotest/msg-clean"
Junio C Hamano5e835ca2008-04-16 12:50:48 -0700693 fi
Junio C Hamano271440e2005-10-25 23:35:37 -0700694 ;;
695 esac
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700696
Jay Soffian43c23252010-06-16 03:12:40 -0400697 if test -f "$dotest/author-script"
698 then
699 eval $(cat "$dotest/author-script")
700 else
701 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
702 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
703 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
704 fi
Junio C Hamanoe0e3ba22005-12-14 16:31:06 -0800705
Junio C Hamano3b789592007-12-05 13:16:35 -0800706 if test -z "$GIT_AUTHOR_EMAIL"
Junio C Hamanoe0e3ba22005-12-14 16:31:06 -0800707 then
Jon Seymourde88c1c2011-08-07 21:58:14 +1000708 gettextln "Patch does not have a valid e-mail address."
Junio C Hamanoe0e3ba22005-12-14 16:31:06 -0800709 stop_here $this
710 fi
711
Junio C Hamano2c674192005-10-20 22:31:56 -0700712 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700713
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800714 case "$resume" in
715 '')
716 if test '' != "$SIGNOFF"
717 then
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700718 LAST_SIGNED_OFF_BY=`
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800719 sed -ne '/^Signed-off-by: /p' \
720 "$dotest/msg-clean" |
Jeff Kingb4ce54f2008-03-12 17:34:34 -0400721 sed -ne '$p'
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700722 `
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800723 ADD_SIGNOFF=`
724 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700725 test '' = "$LAST_SIGNED_OFF_BY" && echo
726 echo "$SIGNOFF"
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800727 }`
728 else
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700729 ADD_SIGNOFF=
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800730 fi
731 {
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700732 if test -s "$dotest/msg-clean"
733 then
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700734 cat "$dotest/msg-clean"
735 fi
736 if test '' != "$ADD_SIGNOFF"
737 then
738 echo "$ADD_SIGNOFF"
739 fi
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800740 } >"$dotest/final-commit"
741 ;;
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800742 *)
Junio C Hamano6d286442006-02-23 22:14:47 -0800743 case "$resolved$interactive" in
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800744 tt)
745 # This is used only for interactive view option.
Junio C Hamano38762c42007-11-28 16:15:04 -0800746 git diff-index -p --cached HEAD -- >"$dotest/patch"
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800747 ;;
748 esac
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800749 esac
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700750
Junio C Hamano4bfb6b62005-11-08 00:41:37 -0800751 resume=
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700752 if test "$interactive" = t
753 then
Junio C Hamanoa1451102005-10-12 18:31:41 -0700754 test -t 0 ||
Ævar Arnfjörð Bjarmason79087252011-05-21 18:43:47 +0000755 die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700756 action=again
757 while test "$action" = again
758 do
Jon Seymourde88c1c2011-08-07 21:58:14 +1000759 gettextln "Commit Body is:"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700760 echo "--------------------------"
761 cat "$dotest/final-commit"
762 echo "--------------------------"
Ævar Arnfjörð Bjarmason7a74d042011-05-21 18:43:50 +0000763 # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
764 # in your translation. The program will only accept English
765 # input at this point.
766 gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700767 read reply
768 case "$reply" in
Junio C Hamanof89ad672005-10-25 23:43:59 -0700769 [yY]*) action=yes ;;
770 [aA]*) action=yes interactive= ;;
771 [nN]*) action=skip ;;
Adam Robenef0c2ab2007-07-19 22:09:35 -0700772 [eE]*) git_editor "$dotest/final-commit"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700773 action=again ;;
Junio C Hamanof89ad672005-10-25 23:43:59 -0700774 [vV]*) action=again
Jonathan Niederf6dff112010-02-14 23:04:13 -0600775 git_pager "$dotest/patch" ;;
Junio C Hamanof89ad672005-10-25 23:43:59 -0700776 *) action=again ;;
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700777 esac
778 done
779 else
780 action=yes
781 fi
Ramkumar Ramachandra92f65e62010-06-02 10:33:37 +0200782
783 if test -f "$dotest/final-commit"
784 then
785 FIRSTLINE=$(sed 1q "$dotest/final-commit")
786 else
787 FIRSTLINE=""
788 fi
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700789
790 if test $action = skip
791 then
792 go_next
793 continue
794 fi
795
796 if test -x "$GIT_DIR"/hooks/applypatch-msg
797 then
798 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
799 stop_here $this
800 fi
801
Ævar Arnfjörð Bjarmasondff1a982011-05-21 18:43:52 +0000802 say "$(eval_gettext "Applying: \$FIRSTLINE")"
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700803
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800804 case "$resolved" in
805 '')
Stephen Boyd3ddd1702009-06-16 15:32:58 -0700806 # When we are allowed to fall back to 3-way later, don't give
807 # false errors during the initial attempt.
808 squelch=
809 if test "$threeway" = t
810 then
811 squelch='>/dev/null 2>&1 '
812 fi
813 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800814 apply_status=$?
815 ;;
816 t)
817 # Resolved means the user did all the hard work, and
818 # we do not have to do any patch application. Just
819 # trust what the user has in the index file and the
820 # working tree.
821 resolved=
Junio C Hamano38762c42007-11-28 16:15:04 -0800822 git diff-index --quiet --cached HEAD -- && {
Jon Seymourde88c1c2011-08-07 21:58:14 +1000823 gettextln "No changes - did you forget to use 'git add'?
Ævar Arnfjörð Bjarmasonbd8643a2011-05-21 18:43:44 +0000824If there is nothing left to stage, chances are that something else
Jon Seymourde88c1c2011-08-07 21:58:14 +1000825already introduced the same changes; you might want to skip this patch."
Robert Shearmanced94562006-05-02 13:32:43 +0100826 stop_here_user_resolve $this
Alex Riesen06aff472007-03-25 01:56:13 +0100827 }
Junio C Hamano5be60072007-07-02 22:52:14 -0700828 unmerged=$(git ls-files -u)
Junio C Hamanoc1d11282006-04-28 02:32:44 -0700829 if test -n "$unmerged"
830 then
Jon Seymourde88c1c2011-08-07 21:58:14 +1000831 gettextln "You still have unmerged paths in your index
832did you forget to use 'git add'?"
Robert Shearmanced94562006-05-02 13:32:43 +0100833 stop_here_user_resolve $this
Junio C Hamanoc1d11282006-04-28 02:32:44 -0700834 fi
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800835 apply_status=0
Johannes Schindelinb4372ef2007-07-06 13:05:59 +0100836 git rerere
Junio C Hamano0c15cc92005-11-16 00:19:32 -0800837 ;;
838 esac
839
Junio C Hamano0ba17dd2010-04-09 16:58:28 -0700840 if test $apply_status != 0 && test "$threeway" = t
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700841 then
Junio C Hamano73319032005-10-13 11:46:43 -0700842 if (fall_back_3way)
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700843 then
Junio C Hamano73319032005-10-13 11:46:43 -0700844 # Applying the patch to an earlier tree and merging the
845 # result may have produced the same tree as ours.
Junio C Hamano38762c42007-11-28 16:15:04 -0800846 git diff-index --quiet --cached HEAD -- && {
Ævar Arnfjörð Bjarmasondff1a982011-05-21 18:43:52 +0000847 say "$(gettext "No changes -- Patch already applied.")"
Alex Riesen06aff472007-03-25 01:56:13 +0100848 go_next
849 continue
850 }
Junio C Hamano73319032005-10-13 11:46:43 -0700851 # clear apply_status -- we have successfully merged.
852 apply_status=0
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700853 fi
854 fi
855 if test $apply_status != 0
856 then
Jon Seymourde88c1c2011-08-07 21:58:14 +1000857 eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
Paul Gortmaker14bf2d52012-07-13 11:51:30 -0400858 if test "$(git config --bool advice.amworkdir)" != false
859 then
860 eval_gettextln "The copy of the patch that failed is found in:
861 $dotest/patch"
862 fi
Robert Shearmanced94562006-05-02 13:32:43 +0100863 stop_here_user_resolve $this
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700864 fi
865
866 if test -x "$GIT_DIR"/hooks/pre-applypatch
867 then
868 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
869 fi
870
Junio C Hamano5be60072007-07-02 22:52:14 -0700871 tree=$(git write-tree) &&
Junio C Hamano3f01ad62009-01-22 16:14:58 -0800872 commit=$(
Nanako Shiraishia79ec622009-01-24 10:18:02 +0900873 if test -n "$ignore_date"
874 then
875 GIT_AUTHOR_DATE=
876 fi
Nanako Shiraishif79d4c82009-04-10 09:34:42 +0900877 parent=$(git rev-parse --verify -q HEAD) ||
Ævar Arnfjörð Bjarmasondff1a982011-05-21 18:43:52 +0000878 say >&2 "$(gettext "applying to an empty history")"
Nanako Shiraishif79d4c82009-04-10 09:34:42 +0900879
Junio C Hamano3f01ad62009-01-22 16:14:58 -0800880 if test -n "$committer_date_is_author_date"
881 then
882 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
883 export GIT_COMMITTER_DATE
884 fi &&
Ben Jacksonea10b602009-04-18 20:42:07 -0700885 git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
Junio C Hamano3f01ad62009-01-22 16:14:58 -0800886 ) &&
Linus Torvalds2e6e3e8292008-04-15 12:56:50 -0700887 git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700888 stop_here $this
889
Thomas Rast96e19482010-03-12 18:04:29 +0100890 if test -f "$dotest/original-commit"; then
891 echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
892 fi
893
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700894 if test -x "$GIT_DIR"/hooks/post-applypatch
895 then
896 "$GIT_DIR"/hooks/post-applypatch
897 fi
898
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700899 go_next
900done
901
Thomas Rasteb2151b2010-03-12 18:04:33 +0100902if test -s "$dotest"/rewritten; then
903 git notes copy --for-rewrite=rebase < "$dotest"/rewritten
904 if test -x "$GIT_DIR"/hooks/post-rewrite; then
Thomas Rast96e19482010-03-12 18:04:29 +0100905 "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
Thomas Rasteb2151b2010-03-12 18:04:33 +0100906 fi
Thomas Rast96e19482010-03-12 18:04:29 +0100907fi
908
Junio C Hamanod1c5f2a2005-10-07 03:44:18 -0700909rm -fr "$dotest"
Jonathan Nieder29b67542010-02-22 08:35:46 -0600910git gc --auto