Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
Junio C Hamano | d64e6b0 | 2006-02-18 20:51:26 -0800 | [diff] [blame] | 3 | # Copyright (c) 2005, 2006 Junio C Hamano |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 4 | |
Jeff King | c149184 | 2008-03-01 01:22:55 -0500 | [diff] [blame] | 5 | SUBDIRECTORY_OK=Yes |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 6 | OPTIONS_KEEPDASHDASH= |
| 7 | OPTIONS_SPEC="\ |
Štěpán Němec | 0adda93 | 2010-10-08 19:31:17 +0200 | [diff] [blame] | 8 | git am [options] [(<mbox>|<Maildir>)...] |
Stephan Beyer | 09f8d05 | 2008-07-25 20:22:23 +0200 | [diff] [blame] | 9 | git am [options] (--resolved | --skip | --abort) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 10 | -- |
Junio C Hamano | 66006c6 | 2007-11-08 23:04:31 -0800 | [diff] [blame] | 11 | i,interactive run interactively |
Jay Soffian | 98ef23b | 2009-01-28 10:03:10 -0500 | [diff] [blame] | 12 | b,binary* (historical option -- no-op) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 13 | 3,3way allow fall back on 3way merging if needed |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 14 | q,quiet be quiet |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 15 | s,signoff add a Signed-off-by line to the commit message |
| 16 | u,utf8 recode into utf8 (default) |
Jörg Sommer | fe1fa94 | 2008-02-03 00:58:06 +0100 | [diff] [blame] | 17 | k,keep pass -k flag to git-mailinfo |
Thomas Rast | f7e5ea1 | 2012-01-16 11:53:00 +0100 | [diff] [blame] | 18 | keep-non-patch pass -b flag to git-mailinfo |
Stefan-W. Hahn | ad2c928 | 2010-02-27 15:20:26 +0100 | [diff] [blame] | 19 | keep-cr pass --keep-cr flag to git-mailsplit for mbox format |
Stefan-W. Hahn | e80d4cb | 2010-02-27 15:20:27 +0100 | [diff] [blame] | 20 | no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr |
Junio C Hamano | 017678b | 2009-08-26 21:36:05 -0700 | [diff] [blame] | 21 | c,scissors strip everything before a scissors line |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 22 | whitespace= pass it through git-apply |
Giuseppe Bilotta | 86c91f9 | 2009-08-04 13:16:49 +0200 | [diff] [blame] | 23 | ignore-space-change pass it through git-apply |
| 24 | ignore-whitespace pass it through git-apply |
Junio C Hamano | b47dfe9 | 2009-01-11 22:21:48 -0800 | [diff] [blame] | 25 | directory= pass it through git-apply |
maximilian attems | 77e9e49 | 2011-08-03 11:37:29 +0200 | [diff] [blame] | 26 | exclude= pass it through git-apply |
Johannes Berg | 58725ef | 2012-03-28 13:11:28 +0200 | [diff] [blame] | 27 | include= pass it through git-apply |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 28 | C= pass it through git-apply |
| 29 | p= pass it through git-apply |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 30 | patch-format= format the patch(es) are in |
martin f. krafft | b80da42 | 2009-01-23 11:31:21 +1100 | [diff] [blame] | 31 | reject pass it through git-apply |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 32 | resolvemsg= override error message when patch failure occurs |
Jeff King | c8089af | 2010-02-11 17:27:14 -0500 | [diff] [blame] | 33 | continue continue applying patches after resolving a conflict |
| 34 | r,resolved synonyms for --continue |
Junio C Hamano | 3041c32 | 2008-03-04 00:25:06 -0800 | [diff] [blame] | 35 | skip skip the current patch |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 36 | abort restore the original branch and abort the patching operation. |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 37 | committer-date-is-author-date lie about committer date |
Nanako Shiraishi | a79ec62 | 2009-01-24 10:18:02 +0900 | [diff] [blame] | 38 | ignore-date use current timestamp for author date |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 39 | rerere-autoupdate update the index with reused conflict resolution if possible |
Jay Soffian | 98ef23b | 2009-01-28 10:03:10 -0500 | [diff] [blame] | 40 | rebasing* (internal use for git-rebase)" |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 41 | |
freku045@student.liu.se | cf1fe88 | 2005-12-13 23:30:31 +0100 | [diff] [blame] | 42 | . git-sh-setup |
Ævar Arnfjörð Bjarmason | b9a9726 | 2011-05-21 18:43:42 +0000 | [diff] [blame] | 43 | . git-sh-i18n |
Junio C Hamano | bb034f8 | 2008-03-04 00:25:04 -0800 | [diff] [blame] | 44 | prefix=$(git rev-parse --show-prefix) |
Shawn O. Pearce | f947413 | 2006-12-28 02:34:48 -0500 | [diff] [blame] | 45 | set_reflog_action am |
Shawn O. Pearce | 7eff28a | 2006-12-30 23:32:38 -0500 | [diff] [blame] | 46 | require_work_tree |
Jeff King | c149184 | 2008-03-01 01:22:55 -0500 | [diff] [blame] | 47 | cd_to_toplevel |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 48 | |
Stephan Beyer | 460abee | 2008-07-12 17:46:59 +0200 | [diff] [blame] | 49 | git var GIT_COMMITTER_IDENT >/dev/null || |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 50 | die "$(gettext "You need to set your committer info first")" |
Junio C Hamano | d64e6b0 | 2006-02-18 20:51:26 -0800 | [diff] [blame] | 51 | |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 52 | if git rev-parse --verify -q HEAD >/dev/null |
| 53 | then |
| 54 | HAS_HEAD=yes |
| 55 | else |
| 56 | HAS_HEAD= |
| 57 | fi |
| 58 | |
Ramkumar Ramachandra | d2c4631 | 2010-06-02 10:33:35 +0200 | [diff] [blame] | 59 | cmdline="git am" |
| 60 | if test '' != "$interactive" |
| 61 | then |
| 62 | cmdline="$cmdline -i" |
| 63 | fi |
| 64 | if test '' != "$threeway" |
| 65 | then |
| 66 | cmdline="$cmdline -3" |
| 67 | fi |
| 68 | |
Junio C Hamano | b47dfe9 | 2009-01-11 22:21:48 -0800 | [diff] [blame] | 69 | sq () { |
Christian Couder | 47c9739 | 2009-04-24 08:29:01 +0200 | [diff] [blame] | 70 | git rev-parse --sq-quote "$@" |
Junio C Hamano | b47dfe9 | 2009-01-11 22:21:48 -0800 | [diff] [blame] | 71 | } |
| 72 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 73 | stop_here () { |
| 74 | echo "$1" >"$dotest/next" |
Junio C Hamano | 7b3b7e3 | 2010-12-21 10:35:53 -0800 | [diff] [blame] | 75 | git rev-parse --verify -q HEAD >"$dotest/abort-safety" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 76 | exit 1 |
| 77 | } |
| 78 | |
Junio C Hamano | 7b3b7e3 | 2010-12-21 10:35:53 -0800 | [diff] [blame] | 79 | safe_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 Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 95 | gettextln "You seem to have moved HEAD since the last 'am' failure. |
| 96 | Not rewinding to ORIG_HEAD" >&2 |
Junio C Hamano | 7b3b7e3 | 2010-12-21 10:35:53 -0800 | [diff] [blame] | 97 | return 1 |
| 98 | } |
| 99 | |
Robert Shearman | ced9456 | 2006-05-02 13:32:43 +0100 | [diff] [blame] | 100 | stop_here_user_resolve () { |
Sean | cc12005 | 2006-05-13 23:34:08 -0400 | [diff] [blame] | 101 | if [ -n "$resolvemsg" ]; then |
Jeff King | a23bfae | 2007-05-26 00:33:03 -0700 | [diff] [blame] | 102 | printf '%s\n' "$resolvemsg" |
Sean | cc12005 | 2006-05-13 23:34:08 -0400 | [diff] [blame] | 103 | stop_here $1 |
| 104 | fi |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 105 | eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\". |
Ævar Arnfjörð Bjarmason | a4372c3 | 2011-05-21 18:43:45 +0000 | [diff] [blame] | 106 | If you would prefer to skip this patch, instead run \"\$cmdline --skip\". |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 107 | To restore the original branch and stop patching run \"\$cmdline --abort\"." |
Robert Shearman | ced9456 | 2006-05-02 13:32:43 +0100 | [diff] [blame] | 108 | |
| 109 | stop_here $1 |
| 110 | } |
| 111 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 112 | go_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 Hamano | fd7bcfb | 2006-08-12 16:16:47 -0700 | [diff] [blame] | 119 | cannot_fallback () { |
| 120 | echo "$1" |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 121 | gettextln "Cannot fall back to three-way merge." |
Junio C Hamano | fd7bcfb | 2006-08-12 16:16:47 -0700 | [diff] [blame] | 122 | exit 1 |
| 123 | } |
| 124 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 125 | fall_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 Hamano | 4056afb | 2012-02-22 21:55:06 -0800 | [diff] [blame] | 132 | cmd="git apply $git_apply_opt --build-fake-ancestor" && |
| 133 | cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' && |
| 134 | eval "$cmd" && |
Junio C Hamano | fd7bcfb | 2006-08-12 16:16:47 -0700 | [diff] [blame] | 135 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 136 | git write-tree >"$dotest/patch-merge-base+" || |
Ævar Arnfjörð Bjarmason | a424ca1 | 2011-05-21 18:43:48 +0000 | [diff] [blame] | 137 | cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")" |
Junio C Hamano | fd7bcfb | 2006-08-12 16:16:47 -0700 | [diff] [blame] | 138 | |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 139 | say Using index info to reconstruct a base tree... |
Junio C Hamano | 4056afb | 2012-02-22 21:55:06 -0800 | [diff] [blame] | 140 | |
| 141 | cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"' |
Junio C Hamano | 5d86861 | 2012-03-28 09:55:21 -0700 | [diff] [blame] | 142 | |
| 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 Hamano | 4056afb | 2012-02-22 21:55:06 -0800 | [diff] [blame] | 148 | cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"' |
| 149 | if eval "$cmd" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 150 | then |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 151 | mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" |
| 152 | mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" |
Junio C Hamano | fd7bcfb | 2006-08-12 16:16:47 -0700 | [diff] [blame] | 153 | else |
Ævar Arnfjörð Bjarmason | a424ca1 | 2011-05-21 18:43:48 +0000 | [diff] [blame] | 154 | cannot_fallback "$(gettext "Did you hand edit your patch? |
| 155 | It does not apply to blobs recorded in its index.")" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 156 | fi |
| 157 | |
| 158 | test -f "$dotest/patch-merge-index" && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 159 | his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) && |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 160 | orig_tree=$(cat "$dotest/patch-merge-base") && |
| 161 | rm -fr "$dotest"/patch-merge-* || exit 1 |
| 162 | |
Ævar Arnfjörð Bjarmason | 865207a | 2011-05-21 18:43:51 +0000 | [diff] [blame] | 163 | say "$(gettext "Falling back to patching base and 3-way merge...")" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 164 | |
| 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. Pearce | 579c9bb | 2006-12-28 02:35:27 -0500 | [diff] [blame] | 168 | # patch did not touch, so recursive ends up canceling them, |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 169 | # saying that we reverted all those changes. |
| 170 | |
Linus Torvalds | 2e6e3e829 | 2008-04-15 12:56:50 -0700 | [diff] [blame] | 171 | eval GITHEAD_$his_tree='"$FIRSTLINE"' |
Shawn O. Pearce | 579c9bb | 2006-12-28 02:35:27 -0500 | [diff] [blame] | 172 | export GITHEAD_$his_tree |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 173 | if test -n "$GIT_QUIET" |
| 174 | then |
Junio C Hamano | 69ae92b | 2010-10-13 11:36:36 -0700 | [diff] [blame] | 175 | GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 176 | fi |
Shawn O. Pearce | 579c9bb | 2006-12-28 02:35:27 -0500 | [diff] [blame] | 177 | git-merge-recursive $orig_tree -- HEAD $his_tree || { |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 178 | git rerere $allow_rerere_autoupdate |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 179 | echo Failed to merge in the changes. |
| 180 | exit 1 |
| 181 | } |
Shawn O. Pearce | 579c9bb | 2006-12-28 02:35:27 -0500 | [diff] [blame] | 182 | unset GITHEAD_$his_tree |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 183 | } |
| 184 | |
Giuseppe Bilotta | 0cd29a0 | 2009-05-27 11:25:19 +0200 | [diff] [blame] | 185 | clean_abort () { |
| 186 | test $# = 0 || echo >&2 "$@" |
| 187 | rm -fr "$dotest" |
| 188 | exit 1 |
| 189 | } |
| 190 | |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 191 | patch_format= |
| 192 | |
| 193 | check_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 Bilotta | 15ced75 | 2009-05-27 23:20:12 +0200 | [diff] [blame] | 199 | |
| 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 Barr | 0e8341f | 2011-08-08 04:49:04 +0200 | [diff] [blame] | 208 | # otherwise, check the first few non-blank lines of the first |
| 209 | # patch to try to detect its format |
Giuseppe Bilotta | 15ced75 | 2009-05-27 23:20:12 +0200 | [diff] [blame] | 210 | { |
David Barr | 0e8341f | 2011-08-08 04:49:04 +0200 | [diff] [blame] | 211 | # Start from first line containing non-whitespace |
| 212 | l1= |
| 213 | while test -z "$l1" |
| 214 | do |
Jim Meyering | f0c5793 | 2012-02-25 18:34:26 +0100 | [diff] [blame] | 215 | read l1 || break |
David Barr | 0e8341f | 2011-08-08 04:49:04 +0200 | [diff] [blame] | 216 | done |
Giuseppe Bilotta | 15ced75 | 2009-05-27 23:20:12 +0200 | [diff] [blame] | 217 | 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 Hamano | 0fcb2ca | 2009-08-06 20:08:12 -0500 | [diff] [blame] | 242 | 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 Boyd | e3f67d3 | 2010-01-25 16:33:59 -0800 | [diff] [blame] | 252 | tr -d '\015' <"$1" | |
| 253 | sed -n -e '/^$/q' -e '/^[ ]/d' -e p | |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 254 | sane_egrep -v '^[!-9;-~]+:' >/dev/null || |
Junio C Hamano | 0fcb2ca | 2009-08-06 20:08:12 -0500 | [diff] [blame] | 255 | patch_format=mbox |
| 256 | fi |
Giuseppe Bilotta | 0cd29a0 | 2009-05-27 11:25:19 +0200 | [diff] [blame] | 257 | } < "$1" || clean_abort |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 258 | } |
| 259 | |
| 260 | split_patches () { |
| 261 | case "$patch_format" in |
| 262 | mbox) |
Stefan-W. Hahn | e80d4cb | 2010-02-27 15:20:27 +0100 | [diff] [blame] | 263 | if test -n "$rebasing" || test t = "$keepcr" |
Stefan-W. Hahn | ad2c928 | 2010-02-27 15:20:26 +0100 | [diff] [blame] | 264 | then |
| 265 | keep_cr=--keep-cr |
| 266 | else |
| 267 | keep_cr= |
| 268 | fi |
Junio C Hamano | c2ca1d7 | 2009-08-04 22:31:59 -0500 | [diff] [blame] | 269 | git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" || |
Giuseppe Bilotta | 0cd29a0 | 2009-05-27 11:25:19 +0200 | [diff] [blame] | 270 | clean_abort |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 271 | ;; |
Giuseppe Bilotta | c574e68 | 2009-05-27 11:25:18 +0200 | [diff] [blame] | 272 | stgit-series) |
| 273 | if test $# -ne 1 |
| 274 | then |
Ævar Arnfjörð Bjarmason | d62a146 | 2011-05-21 18:43:49 +0000 | [diff] [blame] | 275 | clean_abort "$(gettext "Only one StGIT patch series can be applied at once")" |
Giuseppe Bilotta | c574e68 | 2009-05-27 11:25:18 +0200 | [diff] [blame] | 276 | 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 Bilotta | 0cd29a0 | 2009-05-27 11:25:19 +0200 | [diff] [blame] | 290 | } < "$series_file" || clean_abort |
Giuseppe Bilotta | c574e68 | 2009-05-27 11:25:18 +0200 | [diff] [blame] | 291 | # 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 Bilotta | 45d51dc | 2011-08-29 18:44:07 +0200 | [diff] [blame] | 309 | elsif (/^Author:/) { s/Author/From/ ; print ;} |
Giuseppe Bilotta | c574e68 | 2009-05-27 11:25:18 +0200 | [diff] [blame] | 310 | 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 Bilotta | 0cd29a0 | 2009-05-27 11:25:19 +0200 | [diff] [blame] | 319 | ' < "$stgit" > "$dotest/$msgnum" || clean_abort |
Giuseppe Bilotta | c574e68 | 2009-05-27 11:25:18 +0200 | [diff] [blame] | 320 | done |
| 321 | echo "$this" > "$dotest/last" |
| 322 | this= |
| 323 | msgnum= |
| 324 | ;; |
Giuseppe Bilotta | 0cfd112 | 2011-08-29 18:44:06 +0200 | [diff] [blame] | 325 | 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 Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 359 | *) |
Giuseppe Bilotta | dff4b0e | 2011-08-29 17:22:06 +0200 | [diff] [blame] | 360 | if test -n "$patch_format" |
| 361 | then |
Ævar Arnfjörð Bjarmason | d62a146 | 2011-05-21 18:43:49 +0000 | [diff] [blame] | 362 | clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")" |
Nicolas Sebrecht | 46caf50 | 2009-08-06 20:08:13 -0500 | [diff] [blame] | 363 | else |
Ævar Arnfjörð Bjarmason | d62a146 | 2011-05-21 18:43:49 +0000 | [diff] [blame] | 364 | clean_abort "$(gettext "Patch format detection failed.")" |
Nicolas Sebrecht | 46caf50 | 2009-08-06 20:08:13 -0500 | [diff] [blame] | 365 | fi |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 366 | ;; |
| 367 | esac |
| 368 | } |
| 369 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 370 | prec=4 |
Johannes Schindelin | 51ef1da | 2008-07-21 12:51:02 +0200 | [diff] [blame] | 371 | dotest="$GIT_DIR/rebase-apply" |
Stefan-W. Hahn | ad2c928 | 2010-02-27 15:20:26 +0100 | [diff] [blame] | 372 | sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort= |
Lukas Sandström | d25e515 | 2009-11-20 17:12:47 +0100 | [diff] [blame] | 373 | resolvemsg= resume= scissors= no_inbody_headers= |
Michael S. Tsirkin | 67dad68 | 2007-02-08 15:57:08 +0200 | [diff] [blame] | 374 | git_apply_opt= |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 375 | committer_date_is_author_date= |
Nanako Shiraishi | a79ec62 | 2009-01-24 10:18:02 +0900 | [diff] [blame] | 376 | ignore_date= |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 377 | allow_rerere_autoupdate= |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 378 | |
Stefan-W. Hahn | e80d4cb | 2010-02-27 15:20:27 +0100 | [diff] [blame] | 379 | if test "$(git config --bool --get am.keepcr)" = true |
| 380 | then |
| 381 | keepcr=t |
| 382 | fi |
| 383 | |
David Kastrup | 822f7c7 | 2007-09-23 22:42:08 +0200 | [diff] [blame] | 384 | while test $# != 0 |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 385 | do |
| 386 | case "$1" in |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 387 | -i|--interactive) |
| 388 | interactive=t ;; |
| 389 | -b|--binary) |
Junio C Hamano | 6c15a1c | 2012-03-13 11:38:27 -0700 | [diff] [blame] | 390 | 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 Rast | 4eeb1de | 2012-03-12 22:47:19 +0100 | [diff] [blame] | 392 | ;; |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 393 | -3|--3way) |
| 394 | threeway=t ;; |
Johannes Sixt | dfdd7e6 | 2007-11-06 21:33:58 +0100 | [diff] [blame] | 395 | -s|--signoff) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 396 | sign=t ;; |
| 397 | -u|--utf8) |
| 398 | utf8=t ;; # this is now default |
| 399 | --no-utf8) |
| 400 | utf8= ;; |
| 401 | -k|--keep) |
| 402 | keep=t ;; |
Thomas Rast | f7e5ea1 | 2012-01-16 11:53:00 +0100 | [diff] [blame] | 403 | --keep-non-patch) |
| 404 | keep=b ;; |
Junio C Hamano | 017678b | 2009-08-26 21:36:05 -0700 | [diff] [blame] | 405 | -c|--scissors) |
| 406 | scissors=t ;; |
| 407 | --no-scissors) |
| 408 | scissors=f ;; |
Jeff King | c8089af | 2010-02-11 17:27:14 -0500 | [diff] [blame] | 409 | -r|--resolved|--continue) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 410 | resolved=t ;; |
| 411 | --skip) |
| 412 | skip=t ;; |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 413 | --abort) |
| 414 | abort=t ;; |
Junio C Hamano | 3041c32 | 2008-03-04 00:25:06 -0800 | [diff] [blame] | 415 | --rebasing) |
Lukas Sandström | d25e515 | 2009-11-20 17:12:47 +0100 | [diff] [blame] | 416 | rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;; |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 417 | -d|--dotest) |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 418 | die "$(gettext "-d option is no longer supported. Do not use.")" |
Junio C Hamano | e72c740 | 2008-03-04 00:25:05 -0800 | [diff] [blame] | 419 | ;; |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 420 | --resolvemsg) |
| 421 | shift; resolvemsg=$1 ;; |
Johannes Berg | 58725ef | 2012-03-28 13:11:28 +0200 | [diff] [blame] | 422 | --whitespace|--directory|--exclude|--include) |
Junio C Hamano | b47dfe9 | 2009-01-11 22:21:48 -0800 | [diff] [blame] | 423 | git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 424 | -C|-p) |
Junio C Hamano | b47dfe9 | 2009-01-11 22:21:48 -0800 | [diff] [blame] | 425 | git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 426 | --patch-format) |
| 427 | shift ; patch_format="$1" ;; |
Giuseppe Bilotta | 86c91f9 | 2009-08-04 13:16:49 +0200 | [diff] [blame] | 428 | --reject|--ignore-whitespace|--ignore-space-change) |
martin f. krafft | b80da42 | 2009-01-23 11:31:21 +1100 | [diff] [blame] | 429 | git_apply_opt="$git_apply_opt $1" ;; |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 430 | --committer-date-is-author-date) |
| 431 | committer_date_is_author_date=t ;; |
Nanako Shiraishi | a79ec62 | 2009-01-24 10:18:02 +0900 | [diff] [blame] | 432 | --ignore-date) |
| 433 | ignore_date=t ;; |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 434 | --rerere-autoupdate|--no-rerere-autoupdate) |
| 435 | allow_rerere_autoupdate="$1" ;; |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 436 | -q|--quiet) |
| 437 | GIT_QUIET=t ;; |
Stefan-W. Hahn | ad2c928 | 2010-02-27 15:20:26 +0100 | [diff] [blame] | 438 | --keep-cr) |
| 439 | keepcr=t ;; |
Stefan-W. Hahn | e80d4cb | 2010-02-27 15:20:27 +0100 | [diff] [blame] | 440 | --no-keep-cr) |
| 441 | keepcr=f ;; |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 442 | --) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 443 | shift; break ;; |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 444 | *) |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 445 | usage ;; |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 446 | esac |
Pierre Habouzit | 78443d9 | 2007-11-04 11:30:57 +0100 | [diff] [blame] | 447 | shift |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 448 | done |
| 449 | |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 450 | # If the dotest directory exists, but we have finished applying all the |
| 451 | # patches in them, clear it out. |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 452 | if test -d "$dotest" && |
| 453 | last=$(cat "$dotest/last") && |
| 454 | next=$(cat "$dotest/next") && |
| 455 | test $# != 0 && |
| 456 | test "$next" -gt "$last" |
| 457 | then |
| 458 | rm -fr "$dotest" |
| 459 | fi |
| 460 | |
| 461 | if test -d "$dotest" |
| 462 | then |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 463 | case "$#,$skip$resolved$abort" in |
Junio C Hamano | c95b138 | 2006-09-15 23:19:02 -0700 | [diff] [blame] | 464 | 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 Hamano | e72c740 | 2008-03-04 00:25:05 -0800 | [diff] [blame] | 471 | # when there is already $dotest. This is somewhat |
Junio C Hamano | c95b138 | 2006-09-15 23:19:02 -0700 | [diff] [blame] | 472 | # 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 Soffian | 98ef23b | 2009-01-28 10:03:10 -0500 | [diff] [blame] | 475 | test -t 0 |
Junio C Hamano | c95b138 | 2006-09-15 23:19:02 -0700 | [diff] [blame] | 476 | ;; |
| 477 | *) |
| 478 | false |
| 479 | ;; |
| 480 | esac || |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 481 | die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")" |
Junio C Hamano | 271440e | 2005-10-25 23:35:37 -0700 | [diff] [blame] | 482 | resume=yes |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 483 | |
Olivier Marin | 95f8ebb | 2008-07-21 15:39:06 +0200 | [diff] [blame] | 484 | case "$skip,$abort" in |
Junio C Hamano | 2d56a13 | 2009-02-26 11:24:29 -0800 | [diff] [blame] | 485 | t,t) |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 486 | die "$(gettext "Please make up your mind. --skip or --abort?")" |
Junio C Hamano | 2d56a13 | 2009-02-26 11:24:29 -0800 | [diff] [blame] | 487 | ;; |
Olivier Marin | 95f8ebb | 2008-07-21 15:39:06 +0200 | [diff] [blame] | 488 | 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 Hamano | 2d56a13 | 2009-02-26 11:24:29 -0800 | [diff] [blame] | 496 | if test -f "$dotest/rebasing" |
| 497 | then |
| 498 | exec git rebase --abort |
| 499 | fi |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 500 | git rerere clear |
Junio C Hamano | 7b3b7e3 | 2010-12-21 10:35:53 -0800 | [diff] [blame] | 501 | if safe_to_abort |
| 502 | then |
Michael J Gruber | c767184 | 2009-02-26 10:52:53 +0100 | [diff] [blame] | 503 | git read-tree --reset -u HEAD ORIG_HEAD |
| 504 | git reset ORIG_HEAD |
Junio C Hamano | 7b3b7e3 | 2010-12-21 10:35:53 -0800 | [diff] [blame] | 505 | fi |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 506 | rm -fr "$dotest" |
| 507 | exit ;; |
| 508 | esac |
Michael J Gruber | c767184 | 2009-02-26 10:52:53 +0100 | [diff] [blame] | 509 | rm -f "$dotest/dirtyindex" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 510 | else |
Nanako Shiraishi | 3e5057a | 2008-07-16 19:39:10 +0900 | [diff] [blame] | 511 | # Make sure we are not given --skip, --resolved, nor --abort |
| 512 | test "$skip$resolved$abort" = "" || |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 513 | die "$(gettext "Resolve operation not in progress, we are not resuming.")" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 514 | |
| 515 | # Start afresh. |
| 516 | mkdir -p "$dotest" || exit |
| 517 | |
Junio C Hamano | bb034f8 | 2008-03-04 00:25:04 -0800 | [diff] [blame] | 518 | 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 Thoyts | 5e9677c | 2010-09-30 14:24:07 +0100 | [diff] [blame] | 527 | if is_absolute_path "$arg" |
| 528 | then |
| 529 | set "$@" "$arg" |
| 530 | else |
| 531 | set "$@" "$prefix$arg" |
| 532 | fi |
Junio C Hamano | bb034f8 | 2008-03-04 00:25:04 -0800 | [diff] [blame] | 533 | done |
| 534 | shift |
| 535 | fi |
Giuseppe Bilotta | a5a6755 | 2009-05-27 11:25:16 +0200 | [diff] [blame] | 536 | |
| 537 | check_patch_format "$@" |
| 538 | |
| 539 | split_patches "$@" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 540 | |
Junio C Hamano | 017678b | 2009-08-26 21:36:05 -0700 | [diff] [blame] | 541 | # -i can and must be given when resuming; everything |
| 542 | # else is kept |
Junio C Hamano | 9b9f5a2 | 2008-12-05 11:19:43 -0800 | [diff] [blame] | 543 | echo " $git_apply_opt" >"$dotest/apply-opt" |
Junio C Hamano | 22db240 | 2008-12-04 15:38:27 -0800 | [diff] [blame] | 544 | echo "$threeway" >"$dotest/threeway" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 545 | echo "$sign" >"$dotest/sign" |
| 546 | echo "$utf8" >"$dotest/utf8" |
| 547 | echo "$keep" >"$dotest/keep" |
Junio C Hamano | 017678b | 2009-08-26 21:36:05 -0700 | [diff] [blame] | 548 | echo "$scissors" >"$dotest/scissors" |
Lukas Sandström | d25e515 | 2009-11-20 17:12:47 +0100 | [diff] [blame] | 549 | echo "$no_inbody_headers" >"$dotest/no_inbody_headers" |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 550 | echo "$GIT_QUIET" >"$dotest/quiet" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 551 | echo 1 >"$dotest/next" |
Junio C Hamano | 3041c32 | 2008-03-04 00:25:06 -0800 | [diff] [blame] | 552 | if test -n "$rebasing" |
| 553 | then |
| 554 | : >"$dotest/rebasing" |
| 555 | else |
| 556 | : >"$dotest/applying" |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 557 | 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 Hamano | 3041c32 | 2008-03-04 00:25:06 -0800 | [diff] [blame] | 563 | fi |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 564 | fi |
| 565 | |
Jeff King | 2a6f08a | 2011-08-15 17:13:07 -0700 | [diff] [blame] | 566 | git update-index -q --refresh |
| 567 | |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 568 | case "$resolved" in |
| 569 | '') |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 570 | 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 Gruber | c767184 | 2009-02-26 10:52:53 +0100 | [diff] [blame] | 576 | if test "$files" |
| 577 | then |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 578 | test -n "$HAS_HEAD" && : >"$dotest/dirtyindex" |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 579 | die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")" |
Michael J Gruber | c767184 | 2009-02-26 10:52:53 +0100 | [diff] [blame] | 580 | fi |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 581 | esac |
| 582 | |
Thomas Rast | f7e5ea1 | 2012-01-16 11:53:00 +0100 | [diff] [blame] | 583 | # 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 Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 587 | if test "$(cat "$dotest/utf8")" = t |
| 588 | then |
| 589 | utf8=-u |
Junio C Hamano | bb1091a | 2007-01-09 21:31:36 -0800 | [diff] [blame] | 590 | else |
| 591 | utf8=-n |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 592 | fi |
Thomas Rast | f7e5ea1 | 2012-01-16 11:53:00 +0100 | [diff] [blame] | 593 | keep=$(cat "$dotest/keep") |
| 594 | case "$keep" in |
| 595 | t) |
| 596 | keep=-k ;; |
| 597 | b) |
| 598 | keep=-b ;; |
| 599 | *) |
| 600 | keep= ;; |
| 601 | esac |
Junio C Hamano | 017678b | 2009-08-26 21:36:05 -0700 | [diff] [blame] | 602 | case "$(cat "$dotest/scissors")" in |
| 603 | t) |
| 604 | scissors=--scissors ;; |
| 605 | f) |
| 606 | scissors=--no-scissors ;; |
| 607 | esac |
Lukas Sandström | d25e515 | 2009-11-20 17:12:47 +0100 | [diff] [blame] | 608 | if test "$(cat "$dotest/no_inbody_headers")" = t |
| 609 | then |
| 610 | no_inbody_headers=--no-inbody-headers |
| 611 | else |
| 612 | no_inbody_headers= |
| 613 | fi |
Stephen Boyd | 0e987a1 | 2009-06-16 15:33:01 -0700 | [diff] [blame] | 614 | if test "$(cat "$dotest/quiet")" = t |
| 615 | then |
| 616 | GIT_QUIET=t |
| 617 | fi |
Junio C Hamano | 22db240 | 2008-12-04 15:38:27 -0800 | [diff] [blame] | 618 | if test "$(cat "$dotest/threeway")" = t |
| 619 | then |
| 620 | threeway=t |
| 621 | fi |
Junio C Hamano | 9b9f5a2 | 2008-12-05 11:19:43 -0800 | [diff] [blame] | 622 | git_apply_opt=$(cat "$dotest/apply-opt") |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 623 | if test "$(cat "$dotest/sign")" = t |
| 624 | then |
Todd Zullinger | 5354a56 | 2008-07-30 13:48:33 -0400 | [diff] [blame] | 625 | SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e ' |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 626 | s/>.*/>/ |
| 627 | s/^/Signed-off-by: /' |
| 628 | ` |
| 629 | else |
| 630 | SIGNOFF= |
| 631 | fi |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 632 | |
| 633 | last=`cat "$dotest/last"` |
| 634 | this=`cat "$dotest/next"` |
| 635 | if test "$skip" = t |
| 636 | then |
| 637 | this=`expr "$this" + 1` |
Jan Harkes | 6922471 | 2005-12-17 01:01:06 -0500 | [diff] [blame] | 638 | resume= |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 639 | fi |
| 640 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 641 | while test "$this" -le "$last" |
| 642 | do |
| 643 | msgnum=`printf "%0${prec}d" $this` |
| 644 | next=`expr "$this" + 1` |
| 645 | test -f "$dotest/$msgnum" || { |
Jan Harkes | 6922471 | 2005-12-17 01:01:06 -0500 | [diff] [blame] | 646 | resume= |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 647 | go_next |
| 648 | continue |
| 649 | } |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 650 | |
| 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 Hamano | 271440e | 2005-10-25 23:35:37 -0700 | [diff] [blame] | 659 | case "$resume" in |
| 660 | '') |
Lukas Sandström | d25e515 | 2009-11-20 17:12:47 +0100 | [diff] [blame] | 661 | git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \ |
Junio C Hamano | 271440e | 2005-10-25 23:35:37 -0700 | [diff] [blame] | 662 | <"$dotest/$msgnum" >"$dotest/info" || |
| 663 | stop_here $this |
Johannes Schindelin | ca193cf | 2007-07-24 01:02:25 +0100 | [diff] [blame] | 664 | |
| 665 | # skip pine's internal folder data |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 666 | sane_grep '^Author: Mail System Internal Data$' \ |
Johannes Schindelin | ca193cf | 2007-07-24 01:02:25 +0100 | [diff] [blame] | 667 | <"$dotest"/info >/dev/null && |
| 668 | go_next && continue |
| 669 | |
Johannes Schindelin | 28ed6e7 | 2008-07-16 03:33:44 +0200 | [diff] [blame] | 670 | test -s "$dotest/patch" || { |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 671 | eval_gettextln "Patch is empty. Was it split wrong? |
Ævar Arnfjörð Bjarmason | a4372c3 | 2011-05-21 18:43:45 +0000 | [diff] [blame] | 672 | If you would prefer to skip this patch, instead run \"\$cmdline --skip\". |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 673 | To restore the original branch and stop patching run \"\$cmdline --abort\"." |
Don Zickus | 87ab799 | 2007-03-12 15:52:04 -0400 | [diff] [blame] | 674 | stop_here $this |
| 675 | } |
Jay Soffian | 43c2325 | 2010-06-16 03:12:40 -0400 | [diff] [blame] | 676 | rm -f "$dotest/original-commit" "$dotest/author-script" |
Junio C Hamano | 5e835ca | 2008-04-16 12:50:48 -0700 | [diff] [blame] | 677 | 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 Rast | 96e1948 | 2010-03-12 18:04:29 +0100 | [diff] [blame] | 684 | echo "$commit" > "$dotest/original-commit" |
Jay Soffian | 43c2325 | 2010-06-16 03:12:40 -0400 | [diff] [blame] | 685 | get_author_ident_from_commit "$commit" > "$dotest/author-script" |
Junio C Hamano | 5e835ca | 2008-04-16 12:50:48 -0700 | [diff] [blame] | 686 | else |
Junio C Hamano | c970a6f | 2009-11-27 15:06:37 -0800 | [diff] [blame] | 687 | { |
| 688 | sed -n '/^Subject/ s/Subject: //p' "$dotest/info" |
| 689 | echo |
| 690 | cat "$dotest/msg" |
| 691 | } | |
| 692 | git stripspace > "$dotest/msg-clean" |
Junio C Hamano | 5e835ca | 2008-04-16 12:50:48 -0700 | [diff] [blame] | 693 | fi |
Junio C Hamano | 271440e | 2005-10-25 23:35:37 -0700 | [diff] [blame] | 694 | ;; |
| 695 | esac |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 696 | |
Jay Soffian | 43c2325 | 2010-06-16 03:12:40 -0400 | [diff] [blame] | 697 | 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 Hamano | e0e3ba2 | 2005-12-14 16:31:06 -0800 | [diff] [blame] | 705 | |
Junio C Hamano | 3b78959 | 2007-12-05 13:16:35 -0800 | [diff] [blame] | 706 | if test -z "$GIT_AUTHOR_EMAIL" |
Junio C Hamano | e0e3ba2 | 2005-12-14 16:31:06 -0800 | [diff] [blame] | 707 | then |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 708 | gettextln "Patch does not have a valid e-mail address." |
Junio C Hamano | e0e3ba2 | 2005-12-14 16:31:06 -0800 | [diff] [blame] | 709 | stop_here $this |
| 710 | fi |
| 711 | |
Junio C Hamano | 2c67419 | 2005-10-20 22:31:56 -0700 | [diff] [blame] | 712 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 713 | |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 714 | case "$resume" in |
| 715 | '') |
| 716 | if test '' != "$SIGNOFF" |
| 717 | then |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 718 | LAST_SIGNED_OFF_BY=` |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 719 | sed -ne '/^Signed-off-by: /p' \ |
| 720 | "$dotest/msg-clean" | |
Jeff King | b4ce54f | 2008-03-12 17:34:34 -0400 | [diff] [blame] | 721 | sed -ne '$p' |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 722 | ` |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 723 | ADD_SIGNOFF=` |
| 724 | test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 725 | test '' = "$LAST_SIGNED_OFF_BY" && echo |
| 726 | echo "$SIGNOFF" |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 727 | }` |
| 728 | else |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 729 | ADD_SIGNOFF= |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 730 | fi |
| 731 | { |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 732 | if test -s "$dotest/msg-clean" |
| 733 | then |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 734 | cat "$dotest/msg-clean" |
| 735 | fi |
| 736 | if test '' != "$ADD_SIGNOFF" |
| 737 | then |
| 738 | echo "$ADD_SIGNOFF" |
| 739 | fi |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 740 | } >"$dotest/final-commit" |
| 741 | ;; |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 742 | *) |
Junio C Hamano | 6d28644 | 2006-02-23 22:14:47 -0800 | [diff] [blame] | 743 | case "$resolved$interactive" in |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 744 | tt) |
| 745 | # This is used only for interactive view option. |
Junio C Hamano | 38762c4 | 2007-11-28 16:15:04 -0800 | [diff] [blame] | 746 | git diff-index -p --cached HEAD -- >"$dotest/patch" |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 747 | ;; |
| 748 | esac |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 749 | esac |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 750 | |
Junio C Hamano | 4bfb6b6 | 2005-11-08 00:41:37 -0800 | [diff] [blame] | 751 | resume= |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 752 | if test "$interactive" = t |
| 753 | then |
Junio C Hamano | a145110 | 2005-10-12 18:31:41 -0700 | [diff] [blame] | 754 | test -t 0 || |
Ævar Arnfjörð Bjarmason | 7908725 | 2011-05-21 18:43:47 +0000 | [diff] [blame] | 755 | die "$(gettext "cannot be interactive without stdin connected to a terminal.")" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 756 | action=again |
| 757 | while test "$action" = again |
| 758 | do |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 759 | gettextln "Commit Body is:" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 760 | echo "--------------------------" |
| 761 | cat "$dotest/final-commit" |
| 762 | echo "--------------------------" |
Ævar Arnfjörð Bjarmason | 7a74d04 | 2011-05-21 18:43:50 +0000 | [diff] [blame] | 763 | # 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 Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 767 | read reply |
| 768 | case "$reply" in |
Junio C Hamano | f89ad67 | 2005-10-25 23:43:59 -0700 | [diff] [blame] | 769 | [yY]*) action=yes ;; |
| 770 | [aA]*) action=yes interactive= ;; |
| 771 | [nN]*) action=skip ;; |
Adam Roben | ef0c2ab | 2007-07-19 22:09:35 -0700 | [diff] [blame] | 772 | [eE]*) git_editor "$dotest/final-commit" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 773 | action=again ;; |
Junio C Hamano | f89ad67 | 2005-10-25 23:43:59 -0700 | [diff] [blame] | 774 | [vV]*) action=again |
Jonathan Nieder | f6dff11 | 2010-02-14 23:04:13 -0600 | [diff] [blame] | 775 | git_pager "$dotest/patch" ;; |
Junio C Hamano | f89ad67 | 2005-10-25 23:43:59 -0700 | [diff] [blame] | 776 | *) action=again ;; |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 777 | esac |
| 778 | done |
| 779 | else |
| 780 | action=yes |
| 781 | fi |
Ramkumar Ramachandra | 92f65e6 | 2010-06-02 10:33:37 +0200 | [diff] [blame] | 782 | |
| 783 | if test -f "$dotest/final-commit" |
| 784 | then |
| 785 | FIRSTLINE=$(sed 1q "$dotest/final-commit") |
| 786 | else |
| 787 | FIRSTLINE="" |
| 788 | fi |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 789 | |
| 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ð Bjarmason | dff1a98 | 2011-05-21 18:43:52 +0000 | [diff] [blame] | 802 | say "$(eval_gettext "Applying: \$FIRSTLINE")" |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 803 | |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 804 | case "$resolved" in |
| 805 | '') |
Stephen Boyd | 3ddd170 | 2009-06-16 15:32:58 -0700 | [diff] [blame] | 806 | # 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 Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 814 | 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 Hamano | 38762c4 | 2007-11-28 16:15:04 -0800 | [diff] [blame] | 822 | git diff-index --quiet --cached HEAD -- && { |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 823 | gettextln "No changes - did you forget to use 'git add'? |
Ævar Arnfjörð Bjarmason | bd8643a | 2011-05-21 18:43:44 +0000 | [diff] [blame] | 824 | If there is nothing left to stage, chances are that something else |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 825 | already introduced the same changes; you might want to skip this patch." |
Robert Shearman | ced9456 | 2006-05-02 13:32:43 +0100 | [diff] [blame] | 826 | stop_here_user_resolve $this |
Alex Riesen | 06aff47 | 2007-03-25 01:56:13 +0100 | [diff] [blame] | 827 | } |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 828 | unmerged=$(git ls-files -u) |
Junio C Hamano | c1d1128 | 2006-04-28 02:32:44 -0700 | [diff] [blame] | 829 | if test -n "$unmerged" |
| 830 | then |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 831 | gettextln "You still have unmerged paths in your index |
| 832 | did you forget to use 'git add'?" |
Robert Shearman | ced9456 | 2006-05-02 13:32:43 +0100 | [diff] [blame] | 833 | stop_here_user_resolve $this |
Junio C Hamano | c1d1128 | 2006-04-28 02:32:44 -0700 | [diff] [blame] | 834 | fi |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 835 | apply_status=0 |
Johannes Schindelin | b4372ef | 2007-07-06 13:05:59 +0100 | [diff] [blame] | 836 | git rerere |
Junio C Hamano | 0c15cc9 | 2005-11-16 00:19:32 -0800 | [diff] [blame] | 837 | ;; |
| 838 | esac |
| 839 | |
Junio C Hamano | 0ba17dd | 2010-04-09 16:58:28 -0700 | [diff] [blame] | 840 | if test $apply_status != 0 && test "$threeway" = t |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 841 | then |
Junio C Hamano | 7331903 | 2005-10-13 11:46:43 -0700 | [diff] [blame] | 842 | if (fall_back_3way) |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 843 | then |
Junio C Hamano | 7331903 | 2005-10-13 11:46:43 -0700 | [diff] [blame] | 844 | # Applying the patch to an earlier tree and merging the |
| 845 | # result may have produced the same tree as ours. |
Junio C Hamano | 38762c4 | 2007-11-28 16:15:04 -0800 | [diff] [blame] | 846 | git diff-index --quiet --cached HEAD -- && { |
Ævar Arnfjörð Bjarmason | dff1a98 | 2011-05-21 18:43:52 +0000 | [diff] [blame] | 847 | say "$(gettext "No changes -- Patch already applied.")" |
Alex Riesen | 06aff47 | 2007-03-25 01:56:13 +0100 | [diff] [blame] | 848 | go_next |
| 849 | continue |
| 850 | } |
Junio C Hamano | 7331903 | 2005-10-13 11:46:43 -0700 | [diff] [blame] | 851 | # clear apply_status -- we have successfully merged. |
| 852 | apply_status=0 |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 853 | fi |
| 854 | fi |
| 855 | if test $apply_status != 0 |
| 856 | then |
Jon Seymour | de88c1c | 2011-08-07 21:58:14 +1000 | [diff] [blame] | 857 | eval_gettextln 'Patch failed at $msgnum $FIRSTLINE' |
Paul Gortmaker | 14bf2d5 | 2012-07-13 11:51:30 -0400 | [diff] [blame] | 858 | 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 Shearman | ced9456 | 2006-05-02 13:32:43 +0100 | [diff] [blame] | 863 | stop_here_user_resolve $this |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 864 | 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 Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 871 | tree=$(git write-tree) && |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 872 | commit=$( |
Nanako Shiraishi | a79ec62 | 2009-01-24 10:18:02 +0900 | [diff] [blame] | 873 | if test -n "$ignore_date" |
| 874 | then |
| 875 | GIT_AUTHOR_DATE= |
| 876 | fi |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 877 | parent=$(git rev-parse --verify -q HEAD) || |
Ævar Arnfjörð Bjarmason | dff1a98 | 2011-05-21 18:43:52 +0000 | [diff] [blame] | 878 | say >&2 "$(gettext "applying to an empty history")" |
Nanako Shiraishi | f79d4c8 | 2009-04-10 09:34:42 +0900 | [diff] [blame] | 879 | |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 880 | 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 Jackson | ea10b60 | 2009-04-18 20:42:07 -0700 | [diff] [blame] | 885 | git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit" |
Junio C Hamano | 3f01ad6 | 2009-01-22 16:14:58 -0800 | [diff] [blame] | 886 | ) && |
Linus Torvalds | 2e6e3e829 | 2008-04-15 12:56:50 -0700 | [diff] [blame] | 887 | git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent || |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 888 | stop_here $this |
| 889 | |
Thomas Rast | 96e1948 | 2010-03-12 18:04:29 +0100 | [diff] [blame] | 890 | if test -f "$dotest/original-commit"; then |
| 891 | echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten" |
| 892 | fi |
| 893 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 894 | if test -x "$GIT_DIR"/hooks/post-applypatch |
| 895 | then |
| 896 | "$GIT_DIR"/hooks/post-applypatch |
| 897 | fi |
| 898 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 899 | go_next |
| 900 | done |
| 901 | |
Thomas Rast | eb2151b | 2010-03-12 18:04:33 +0100 | [diff] [blame] | 902 | if 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 Rast | 96e1948 | 2010-03-12 18:04:29 +0100 | [diff] [blame] | 905 | "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten |
Thomas Rast | eb2151b | 2010-03-12 18:04:33 +0100 | [diff] [blame] | 906 | fi |
Thomas Rast | 96e1948 | 2010-03-12 18:04:29 +0100 | [diff] [blame] | 907 | fi |
| 908 | |
Junio C Hamano | d1c5f2a | 2005-10-07 03:44:18 -0700 | [diff] [blame] | 909 | rm -fr "$dotest" |
Jonathan Nieder | 29b6754 | 2010-02-22 08:35:46 -0600 | [diff] [blame] | 910 | git gc --auto |