Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 467 lines (413 sloc) 11.144 kb
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
1 #!/bin/sh
2 #
d64e6b0 Keep Porcelainish from failing by broken ident after making changes.
Junio C Hamano authored
3 # Copyright (c) 2005, 2006 Junio C Hamano
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
4
8273c79 war on whitespaces: documentation.
Junio C Hamano authored
5 USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
6 [--interactive] [--whitespace=<option>] <mbox>...
cf1fe88 git-am: Usage string clean-up
freku045@student.liu.se authored
7 or, when resuming [--skip | --resolved]'
8 . git-sh-setup
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
9
d64e6b0 Keep Porcelainish from failing by broken ident after making changes.
Junio C Hamano authored
10 git var GIT_COMMITTER_IDENT >/dev/null || exit
11
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
12 stop_here () {
13 echo "$1" >"$dotest/next"
14 exit 1
15 }
16
ced9456 Give the user a hint for how to continue in the case that git-am fails b...
Robert Shearman authored
17 stop_here_user_resolve () {
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
18 if [ -n "$resolvemsg" ]; then
19 echo "$resolvemsg"
20 stop_here $1
21 fi
ced9456 Give the user a hint for how to continue in the case that git-am fails b...
Robert Shearman authored
22 cmdline=$(basename $0)
23 if test '' != "$interactive"
24 then
25 cmdline="$cmdline -i"
26 fi
27 if test '' != "$threeway"
28 then
29 cmdline="$cmdline -3"
30 fi
31 if test '.dotest' != "$dotest"
32 then
33 cmdline="$cmdline -d=$dotest"
34 fi
35 echo "When you have resolved this problem run \"$cmdline --resolved\"."
36 echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
37
38 stop_here $1
39 }
40
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
41 go_next () {
42 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
43 "$dotest/patch" "$dotest/info"
44 echo "$next" >"$dotest/next"
45 this=$next
46 }
47
fd7bcfb git-am: give better diagnostics when the patch does not apply during --3...
Junio C Hamano authored
48 cannot_fallback () {
49 echo "$1"
50 echo "Cannot fall back to three-way merge."
51 exit 1
52 }
53
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
54 fall_back_3way () {
55 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
56
57 rm -fr "$dotest"/patch-merge-*
58 mkdir "$dotest/patch-merge-tmp-dir"
59
60 # First see if the patch records the index info that we can use.
fd7bcfb git-am: give better diagnostics when the patch does not apply during --3...
Junio C Hamano authored
61 git-apply -z --index-info "$dotest/patch" \
62 >"$dotest/patch-merge-index-info" &&
63 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
64 git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
65 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
66 git-write-tree >"$dotest/patch-merge-base+" ||
67 cannot_fallback "Patch does not record usable index information."
68
69 echo Using index info to reconstruct a base tree...
70 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
b762727 git-am: use apply --cached
Junio C Hamano authored
71 git-apply $binary --cached <"$dotest/patch"
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
72 then
73 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
74 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
fd7bcfb git-am: give better diagnostics when the patch does not apply during --3...
Junio C Hamano authored
75 else
76 cannot_fallback "Did you hand edit your patch?
77 It does not apply to blobs recorded in its index."
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
78 fi
79
80 test -f "$dotest/patch-merge-index" &&
81 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) &&
82 orig_tree=$(cat "$dotest/patch-merge-base") &&
83 rm -fr "$dotest"/patch-merge-* || exit 1
84
85 echo Falling back to patching base and 3-way merge...
86
87 # This is not so wrong. Depending on which base we picked,
88 # orig_tree may be wildly different from ours, but his_tree
89 # has the same set of wildly different changes in parts the
82e5a82 @proski Fix more typos, primarily in the code
proski authored
90 # patch did not touch, so resolve ends up canceling them,
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
91 # saying that we reverted all those changes.
92
93 git-merge-resolve $orig_tree -- HEAD $his_tree || {
1536dd9 Only call git-rerere if $GIT_DIR/rr-cache exists.
Junio C Hamano authored
94 if test -d "$GIT_DIR/rr-cache"
95 then
96 git-rerere
97 fi
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
98 echo Failed to merge in the changes.
99 exit 1
100 }
101 }
102
103 prec=4
8ef1c7c @spearce Record rebase changes as 'rebase' in the reflog.
spearce authored
104 rloga=am
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
105 dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
106
107 while case "$#" in 0) break;; esac
108 do
109 case "$1" in
110 -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
8096fae @dstosberg Fix expr usage for FreeBSD
dstosberg authored
111 dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
112 -d|--d|--do|--dot|--dote|--dotes|--dotest)
113 case "$#" in 1) usage ;; esac; shift
114 dotest="$1"; shift;;
115
116 -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
117 --interacti|--interactiv|--interactive)
118 interactive=t; shift ;;
119
087b674 git-am: --binary; document --resume and --binary.
Junio C Hamano authored
120 -b|--b|--bi|--bin|--bina|--binar|--binary)
121 binary=t; shift ;;
122
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
123 -3|--3|--3w|--3wa|--3way)
124 threeway=t; shift ;;
125 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
126 sign=t; shift ;;
127 -u|--u|--ut|--utf|--utf8)
128 utf8=t; shift ;;
129 -k|--k|--ke|--kee|--keep)
130 keep=t; shift ;;
131
0c15cc9 git-am: --resolved.
Junio C Hamano authored
132 -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved)
133 resolved=t; shift ;;
134
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
135 --sk|--ski|--skip)
136 skip=t; shift ;;
137
8c31cb8 git-am: --whitespace=x option.
Junio C Hamano authored
138 --whitespace=*)
139 ws=$1; shift ;;
140
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
141 --resolvemsg=*)
142 resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;
143
8ef1c7c @spearce Record rebase changes as 'rebase' in the reflog.
spearce authored
144 --reflog-action=*)
145 rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
146
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
147 --)
148 shift; break ;;
149 -*)
150 usage ;;
151 *)
152 break ;;
153 esac
154 done
155
0c15cc9 git-am: --resolved.
Junio C Hamano authored
156 # If the dotest directory exists, but we have finished applying all the
157 # patches in them, clear it out.
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
158 if test -d "$dotest" &&
159 last=$(cat "$dotest/last") &&
160 next=$(cat "$dotest/next") &&
161 test $# != 0 &&
162 test "$next" -gt "$last"
163 then
164 rm -fr "$dotest"
165 fi
166
167 if test -d "$dotest"
168 then
c95b138 Fix git-am safety checks
Junio C Hamano authored
169 case "$#,$skip$resolved" in
170 0,*t*)
171 # Explicit resume command and we do not have file, so
172 # we are happy.
173 : ;;
174 0,)
175 # No file input but without resume parameters; catch
176 # user error to feed us a patch from standard input
177 # when there is already .dotest. This is somewhat
178 # unreliable -- stdin could be /dev/null for example
179 # and the caller did not intend to feed us a patch but
180 # wanted to continue unattended.
181 tty -s
182 ;;
183 *)
184 false
185 ;;
186 esac ||
187 die "previous dotest directory $dotest still exists but mbox given."
271440e git-am: make it easier after fixing up an unapplicable patch.
Junio C Hamano authored
188 resume=yes
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
189 else
0c15cc9 git-am: --resolved.
Junio C Hamano authored
190 # Make sure we are not given --skip nor --resolved
191 test ",$skip,$resolved," = ,,, ||
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
192 die "Resolve operation not in progress, we are not resuming."
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
193
194 # Start afresh.
195 mkdir -p "$dotest" || exit
196
b3f041f git-am support for naked email messages (take 2)
H. Peter Anvin authored
197 git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
198 rm -fr "$dotest"
199 exit 1
200 }
201
8c31cb8 git-am: --whitespace=x option.
Junio C Hamano authored
202 # -b, -s, -u, -k and --whitespace flags are kept for the
203 # resuming session after a patch failure.
0c15cc9 git-am: --resolved.
Junio C Hamano authored
204 # -3 and -i can and must be given when resuming.
087b674 git-am: --binary; document --resume and --binary.
Junio C Hamano authored
205 echo "$binary" >"$dotest/binary"
8c31cb8 git-am: --whitespace=x option.
Junio C Hamano authored
206 echo " $ws" >"$dotest/whitespace"
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
207 echo "$sign" >"$dotest/sign"
208 echo "$utf8" >"$dotest/utf8"
209 echo "$keep" >"$dotest/keep"
210 echo 1 >"$dotest/next"
211 fi
212
0c15cc9 git-am: --resolved.
Junio C Hamano authored
213 case "$resolved" in
214 '')
215 files=$(git-diff-index --cached --name-only HEAD) || exit
216 if [ "$files" ]; then
217 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
218 exit 1
219 fi
220 esac
221
087b674 git-am: --binary; document --resume and --binary.
Junio C Hamano authored
222 if test "$(cat "$dotest/binary")" = t
223 then
224 binary=--allow-binary-replacement
225 fi
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
226 if test "$(cat "$dotest/utf8")" = t
227 then
228 utf8=-u
229 fi
230 if test "$(cat "$dotest/keep")" = t
231 then
232 keep=-k
233 fi
8c31cb8 git-am: --whitespace=x option.
Junio C Hamano authored
234 ws=`cat "$dotest/whitespace"`
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
235 if test "$(cat "$dotest/sign")" = t
236 then
237 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
238 s/>.*/>/
239 s/^/Signed-off-by: /'
240 `
241 else
242 SIGNOFF=
243 fi
244
245 last=`cat "$dotest/last"`
246 this=`cat "$dotest/next"`
247 if test "$skip" = t
248 then
f131dd4 rerere: record (or avoid misrecording) resolved, skipped or aborted reba...
Eric Wong authored
249 if test -d "$GIT_DIR/rr-cache"
250 then
251 git-rerere clear
252 fi
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
253 this=`expr "$this" + 1`
6922471 @jaharkes Fix git-am --skip
jaharkes authored
254 resume=
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
255 fi
256
257 if test "$this" -gt "$last"
258 then
259 echo Nothing to do.
260 rm -fr "$dotest"
261 exit
262 fi
263
264 while test "$this" -le "$last"
265 do
266 msgnum=`printf "%0${prec}d" $this`
267 next=`expr "$this" + 1`
268 test -f "$dotest/$msgnum" || {
6922471 @jaharkes Fix git-am --skip
jaharkes authored
269 resume=
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
270 go_next
271 continue
272 }
0c15cc9 git-am: --resolved.
Junio C Hamano authored
273
274 # If we are not resuming, parse and extract the patch information
275 # into separate files:
276 # - info records the authorship and title
277 # - msg is the rest of commit log message
278 # - patch is the patch body.
279 #
280 # When we are resuming, these files are either already prepared
281 # by the user, or the user can tell us to do so by --resolved flag.
271440e git-am: make it easier after fixing up an unapplicable patch.
Junio C Hamano authored
282 case "$resume" in
283 '')
284 git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
285 <"$dotest/$msgnum" >"$dotest/info" ||
286 stop_here $this
287 git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
288 ;;
289 esac
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
290
291 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
292 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
293 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
e0e3ba2 mailinfo and git-am: allow "John Doe <johndoe>"
Junio C Hamano authored
294
295 if test -z "$GIT_AUTHOR_EMAIL"
296 then
297 echo "Patch does not have a valid e-mail address."
298 stop_here $this
299 fi
300
2c67419 Fix missing exports in git-am
Junio C Hamano authored
301 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
302
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
303 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
304 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
305
306 case "$resume" in
307 '')
308 if test '' != "$SIGNOFF"
309 then
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
310 LAST_SIGNED_OFF_BY=`
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
311 sed -ne '/^Signed-off-by: /p' \
312 "$dotest/msg-clean" |
313 tail -n 1
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
314 `
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
315 ADD_SIGNOFF=`
316 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
317 test '' = "$LAST_SIGNED_OFF_BY" && echo
318 echo "$SIGNOFF"
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
319 }`
320 else
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
321 ADD_SIGNOFF=
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
322 fi
323 {
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
324 echo "$SUBJECT"
325 if test -s "$dotest/msg-clean"
326 then
327 echo
328 cat "$dotest/msg-clean"
329 fi
330 if test '' != "$ADD_SIGNOFF"
331 then
332 echo "$ADD_SIGNOFF"
333 fi
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
334 } >"$dotest/final-commit"
335 ;;
0c15cc9 git-am: --resolved.
Junio C Hamano authored
336 *)
6d28644 git-am: do not allow empty commits by mistake.
Junio C Hamano authored
337 case "$resolved$interactive" in
0c15cc9 git-am: --resolved.
Junio C Hamano authored
338 tt)
339 # This is used only for interactive view option.
340 git-diff-index -p --cached HEAD >"$dotest/patch"
341 ;;
342 esac
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
343 esac
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
344
4bfb6b6 git-am: do not lose already edited final-commit when resuming.
Junio C Hamano authored
345 resume=
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
346 if test "$interactive" = t
347 then
a145110 git-am: interactive should fail gracefully.
Junio C Hamano authored
348 test -t 0 ||
349 die "cannot be interactive without stdin connected to a terminal."
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
350 action=again
351 while test "$action" = again
352 do
353 echo "Commit Body is:"
354 echo "--------------------------"
355 cat "$dotest/final-commit"
356 echo "--------------------------"
9754563 Use printf rather than echo -n.
Jason Riedy authored
357 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
358 read reply
359 case "$reply" in
f89ad67 Add [v]iew patch in git-am interactive.
Junio C Hamano authored
360 [yY]*) action=yes ;;
361 [aA]*) action=yes interactive= ;;
362 [nN]*) action=skip ;;
363 [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
364 action=again ;;
f89ad67 Add [v]iew patch in git-am interactive.
Junio C Hamano authored
365 [vV]*) action=again
366 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
367 *) action=again ;;
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
368 esac
369 done
370 else
371 action=yes
372 fi
373
374 if test $action = skip
375 then
376 go_next
377 continue
378 fi
379
380 if test -x "$GIT_DIR"/hooks/applypatch-msg
381 then
382 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
383 stop_here $this
384 fi
385
386 echo
387 echo "Applying '$SUBJECT'"
388 echo
389
0c15cc9 git-am: --resolved.
Junio C Hamano authored
390 case "$resolved" in
391 '')
8c31cb8 git-am: --whitespace=x option.
Junio C Hamano authored
392 git-apply $binary --index $ws "$dotest/patch"
0c15cc9 git-am: --resolved.
Junio C Hamano authored
393 apply_status=$?
394 ;;
395 t)
396 # Resolved means the user did all the hard work, and
397 # we do not have to do any patch application. Just
398 # trust what the user has in the index file and the
399 # working tree.
400 resolved=
6d28644 git-am: do not allow empty commits by mistake.
Junio C Hamano authored
401 changed="$(git-diff-index --cached --name-only HEAD)"
402 if test '' = "$changed"
403 then
64646d1 @spearce Suggest 'add' in am/revert/cherry-pick.
spearce authored
404 echo "No changes - did you forget to use 'git add'?"
ced9456 Give the user a hint for how to continue in the case that git-am fails b...
Robert Shearman authored
405 stop_here_user_resolve $this
6d28644 git-am: do not allow empty commits by mistake.
Junio C Hamano authored
406 fi
c1d1128 git-am --resolved: more usable error message.
Junio C Hamano authored
407 unmerged=$(git-ls-files -u)
408 if test -n "$unmerged"
409 then
410 echo "You still have unmerged paths in your index"
64646d1 @spearce Suggest 'add' in am/revert/cherry-pick.
spearce authored
411 echo "did you forget to use 'git add'?"
ced9456 Give the user a hint for how to continue in the case that git-am fails b...
Robert Shearman authored
412 stop_here_user_resolve $this
c1d1128 git-am --resolved: more usable error message.
Junio C Hamano authored
413 fi
0c15cc9 git-am: --resolved.
Junio C Hamano authored
414 apply_status=0
f131dd4 rerere: record (or avoid misrecording) resolved, skipped or aborted reba...
Eric Wong authored
415 if test -d "$GIT_DIR/rr-cache"
416 then
417 git rerere
418 fi
0c15cc9 git-am: --resolved.
Junio C Hamano authored
419 ;;
420 esac
421
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
422 if test $apply_status = 1 && test "$threeway" = t
423 then
7331903 git-am: do not fail if 3-way fallback succeeds.
Junio C Hamano authored
424 if (fall_back_3way)
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
425 then
7331903 git-am: do not fail if 3-way fallback succeeds.
Junio C Hamano authored
426 # Applying the patch to an earlier tree and merging the
427 # result may have produced the same tree as ours.
6d28644 git-am: do not allow empty commits by mistake.
Junio C Hamano authored
428 changed="$(git-diff-index --cached --name-only HEAD)"
7331903 git-am: do not fail if 3-way fallback succeeds.
Junio C Hamano authored
429 if test '' = "$changed"
430 then
431 echo No changes -- Patch already applied.
432 go_next
433 continue
434 fi
435 # clear apply_status -- we have successfully merged.
436 apply_status=0
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
437 fi
438 fi
439 if test $apply_status != 0
440 then
441 echo Patch failed at $msgnum.
ced9456 Give the user a hint for how to continue in the case that git-am fails b...
Robert Shearman authored
442 stop_here_user_resolve $this
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
443 fi
444
445 if test -x "$GIT_DIR"/hooks/pre-applypatch
446 then
447 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
448 fi
449
450 tree=$(git-write-tree) &&
451 echo Wrote tree $tree &&
452 parent=$(git-rev-parse --verify HEAD) &&
453 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
454 echo Committed: $commit &&
8ef1c7c @spearce Record rebase changes as 'rebase' in the reflog.
spearce authored
455 git-update-ref -m "$rloga: $SUBJECT" HEAD $commit $parent ||
d1c5f2a Add git-am, applymbox replacement.
Junio C Hamano authored
456 stop_here $this
457
458 if test -x "$GIT_DIR"/hooks/post-applypatch
459 then
460 "$GIT_DIR"/hooks/post-applypatch
461 fi
462
463 go_next
464 done
465
466 rm -fr "$dotest"
Something went wrong with that request. Please try again.