rebase -i: remove leftover debugging
[git/git.git] / git-rebase--interactive.sh
CommitLineData
1b1dce4b
JS
1#!/bin/sh
2#
3# Copyright (c) 2006 Johannes E. Schindelin
4
5# SHORT DESCRIPTION
6#
7# This script makes it easy to fix up commits in the middle of a series,
8# and rearrange commits.
9#
10# The original idea comes from Eric W. Biederman, in
11# http://article.gmane.org/gmane.comp.version-control.git/22407
12
7970aaf0
SB
13OPTIONS_KEEPDASHDASH=
14OPTIONS_SPEC="\
15git-rebase [-i] [options] [--] <upstream> [<branch>]
16git-rebase [-i] (--continue | --abort | --skip)
17--
18 Available options are
19v,verbose display a diffstat of what changed upstream
20onto= rebase onto given branch instead of upstream
21p,preserve-merges try to recreate merges instead of ignoring them
22s,strategy= use the given merge strategy
23m,merge always used (no-op)
24i,interactive always used (no-op)
25 Actions:
26continue continue rebasing process
27abort abort rebasing process and restore original branch
28skip skip current patch and continue rebasing process
29"
1b1dce4b
JS
30
31. git-sh-setup
32require_work_tree
33
28ed6e7b 34DOTEST="$GIT_DIR/rebase-merge"
c22486c9 35TODO="$DOTEST"/git-rebase-todo
1b1dce4b 36DONE="$DOTEST"/done
6368f3f8
JS
37MSG="$DOTEST"/message
38SQUASH_MSG="$DOTEST"/message-squash
f09c9b8c
JS
39REWRITTEN="$DOTEST"/rewritten
40PRESERVE_MERGES=
1b1dce4b 41STRATEGY=
7970aaf0 42ONTO=
1b1dce4b
JS
43VERBOSE=
44
804c7174
WC
45GIT_CHERRY_PICK_HELP=" After resolving the conflicts,
46mark the corrected paths with 'git add <paths>', and
47run 'git rebase --continue'"
48export GIT_CHERRY_PICK_HELP
49
1b1dce4b
JS
50warn () {
51 echo "$*" >&2
52}
53
dfa49f33
JS
54output () {
55 case "$VERBOSE" in
56 '')
5166810b 57 output=$("$@" 2>&1 )
dfa49f33 58 status=$?
5166810b 59 test $status != 0 && printf "%s\n" "$output"
dfa49f33 60 return $status
376ccb8c 61 ;;
dfa49f33
JS
62 *)
63 "$@"
376ccb8c 64 ;;
dfa49f33
JS
65 esac
66}
67
1b1dce4b
JS
68require_clean_work_tree () {
69 # test if working tree is dirty
70 git rev-parse --verify HEAD > /dev/null &&
6848d58c
JS
71 git update-index --ignore-submodules --refresh &&
72 git diff-files --quiet --ignore-submodules &&
73 git diff-index --cached --quiet HEAD --ignore-submodules -- ||
1b1dce4b
JS
74 die "Working tree is dirty"
75}
76
77ORIG_REFLOG_ACTION="$GIT_REFLOG_ACTION"
78
79comment_for_reflog () {
80 case "$ORIG_REFLOG_ACTION" in
81 ''|rebase*)
82 GIT_REFLOG_ACTION="rebase -i ($1)"
83 export GIT_REFLOG_ACTION
376ccb8c 84 ;;
1b1dce4b
JS
85 esac
86}
87
4e673877 88last_count=
1b1dce4b
JS
89mark_action_done () {
90 sed -e 1q < "$TODO" >> "$DONE"
91 sed -e 1d < "$TODO" >> "$TODO".new
92 mv -f "$TODO".new "$TODO"
aadbe44f
JK
93 count=$(grep -c '^[^#]' < "$DONE")
94 total=$(($count+$(grep -c '^[^#]' < "$TODO")))
4e673877
JH
95 if test "$last_count" != "$count"
96 then
97 last_count=$count
98 printf "Rebasing (%d/%d)\r" $count $total
99 test -z "$VERBOSE" || echo
100 fi
1b1dce4b
JS
101}
102
103make_patch () {
be6ff208
JS
104 parent_sha1=$(git rev-parse --verify "$1"^) ||
105 die "Cannot get patch for $1^"
f3d5e463 106 git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
be6ff208
JS
107 test -f "$DOTEST"/message ||
108 git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
109 test -f "$DOTEST"/author-script ||
110 get_author_ident_from_commit "$1" > "$DOTEST"/author-script
1b1dce4b
JS
111}
112
113die_with_patch () {
114 make_patch "$1"
ecfe72ff 115 git rerere
1b1dce4b
JS
116 die "$2"
117}
118
c54b7817
JS
119die_abort () {
120 rm -rf "$DOTEST"
121 die "$1"
122}
123
376ccb8c 124has_action () {
aadbe44f 125 grep '^[^#]' "$1" >/dev/null
376ccb8c
JS
126}
127
1b1dce4b 128pick_one () {
1d25c8cf
JS
129 no_ff=
130 case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac
dfa49f33 131 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
f09c9b8c
JS
132 test -d "$REWRITTEN" &&
133 pick_one_preserving_merges "$@" && return
376ccb8c
JS
134 parent_sha1=$(git rev-parse --verify $sha1^) ||
135 die "Could not get the parent of $sha1"
1b1dce4b 136 current_sha1=$(git rev-parse --verify HEAD)
2858028e 137 if test "$no_ff$current_sha1" = "$parent_sha1"; then
dfa49f33
JS
138 output git reset --hard $sha1
139 test "a$1" = a-n && output git reset --soft $current_sha1
1b1dce4b 140 sha1=$(git rev-parse --short $sha1)
dfa49f33 141 output warn Fast forward to $sha1
1b1dce4b 142 else
2a9c53e0 143 output git cherry-pick "$@"
1b1dce4b
JS
144 fi
145}
146
f09c9b8c 147pick_one_preserving_merges () {
71d9451e
TR
148 fast_forward=t
149 case "$1" in
150 -n)
151 fast_forward=f
152 sha1=$2
153 ;;
154 *)
155 sha1=$1
156 ;;
157 esac
f09c9b8c
JS
158 sha1=$(git rev-parse $sha1)
159
3b38ec16 160 if test -f "$DOTEST"/current-commit
f09c9b8c
JS
161 then
162 current_commit=$(cat "$DOTEST"/current-commit) &&
163 git rev-parse HEAD > "$REWRITTEN"/$current_commit &&
164 rm "$DOTEST"/current-commit ||
165 die "Cannot write current commit's replacement sha1"
166 fi
167
a96dc01e
TR
168 echo $sha1 > "$DOTEST"/current-commit
169
f09c9b8c 170 # rewrite parents; if none were rewritten, we can fast-forward.
f09c9b8c 171 new_parents=
376ccb8c 172 for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
f09c9b8c 173 do
3b38ec16 174 if test -f "$REWRITTEN"/$p
f09c9b8c 175 then
f09c9b8c
JS
176 new_p=$(cat "$REWRITTEN"/$p)
177 test $p != $new_p && fast_forward=f
178 case "$new_parents" in
179 *$new_p*)
180 ;; # do nothing; that parent is already there
181 *)
182 new_parents="$new_parents $new_p"
376ccb8c 183 ;;
f09c9b8c 184 esac
1c5fa0a1
SB
185 else
186 new_parents="$new_parents $p"
f09c9b8c
JS
187 fi
188 done
189 case $fast_forward in
190 t)
dfa49f33 191 output warn "Fast forward to $sha1"
71d9451e
TR
192 output git reset --hard $sha1 ||
193 die "Cannot fast forward to $sha1"
f09c9b8c
JS
194 ;;
195 f)
196 test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
197
376ccb8c 198 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
f09c9b8c 199 # detach HEAD to current parent
dfa49f33 200 output git checkout $first_parent 2> /dev/null ||
f09c9b8c
JS
201 die "Cannot move HEAD to $first_parent"
202
f09c9b8c 203 case "$new_parents" in
376ccb8c 204 ' '*' '*)
f09c9b8c
JS
205 # redo merge
206 author_script=$(get_author_ident_from_commit $sha1)
207 eval "$author_script"
376ccb8c 208 msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
f91333d6
BS
209 # No point in merging the first parent, that's HEAD
210 new_parents=${new_parents# $first_parent}
ae830ed7
JS
211 if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
212 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
213 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
214 output git merge $STRATEGY -m "$msg" \
215 $new_parents
f09c9b8c 216 then
ecfe72ff 217 git rerere
376ccb8c 218 printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
18640d99 219 die Error redoing merge $sha1
f09c9b8c
JS
220 fi
221 ;;
222 *)
2a9c53e0 223 output git cherry-pick "$@" ||
f09c9b8c 224 die_with_patch $sha1 "Could not pick $sha1"
376ccb8c 225 ;;
f09c9b8c 226 esac
376ccb8c 227 ;;
f09c9b8c
JS
228 esac
229}
230
6368f3f8
JS
231nth_string () {
232 case "$1" in
233 *1[0-9]|*[04-9]) echo "$1"th;;
234 *1) echo "$1"st;;
235 *2) echo "$1"nd;;
236 *3) echo "$1"rd;;
237 esac
238}
239
240make_squash_message () {
3b38ec16 241 if test -f "$SQUASH_MSG"; then
c7965afd 242 COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
b4ce54fc 243 < "$SQUASH_MSG" | sed -ne '$p')+1))
6368f3f8 244 echo "# This is a combination of $COUNT commits."
8ad1065e
JH
245 sed -e 1d -e '2,/^./{
246 /^$/d
247 }' <"$SQUASH_MSG"
6368f3f8
JS
248 else
249 COUNT=2
250 echo "# This is a combination of two commits."
251 echo "# The first commit's message is:"
252 echo
253 git cat-file commit HEAD | sed -e '1,/^$/d'
6368f3f8 254 fi
8ad1065e 255 echo
6368f3f8
JS
256 echo "# This is the $(nth_string $COUNT) commit message:"
257 echo
258 git cat-file commit $1 | sed -e '1,/^$/d'
259}
260
261peek_next_command () {
262 sed -n "1s/ .*$//p" < "$TODO"
263}
264
1b1dce4b 265do_next () {
376ccb8c
JS
266 rm -f "$DOTEST"/message "$DOTEST"/author-script \
267 "$DOTEST"/amend || exit
1b1dce4b
JS
268 read command sha1 rest < "$TODO"
269 case "$command" in
376ccb8c 270 '#'*|'')
1b1dce4b 271 mark_action_done
1b1dce4b 272 ;;
f8babc4d 273 pick|p)
1b1dce4b
JS
274 comment_for_reflog pick
275
276 mark_action_done
277 pick_one $sha1 ||
278 die_with_patch $sha1 "Could not apply $sha1... $rest"
279 ;;
f8babc4d 280 edit|e)
1b1dce4b
JS
281 comment_for_reflog edit
282
283 mark_action_done
284 pick_one $sha1 ||
285 die_with_patch $sha1 "Could not apply $sha1... $rest"
286 make_patch $sha1
c14c3c82 287 git rev-parse --verify HEAD > "$DOTEST"/amend
a8ccc204 288 warn "Stopped at $sha1... $rest"
1b1dce4b
JS
289 warn "You can amend the commit now, with"
290 warn
291 warn " git commit --amend"
292 warn
0460fb44
JS
293 warn "Once you are satisfied with your changes, run"
294 warn
295 warn " git rebase --continue"
296 warn
1b1dce4b
JS
297 exit 0
298 ;;
f8babc4d 299 squash|s)
1b1dce4b
JS
300 comment_for_reflog squash
301
376ccb8c 302 has_action "$DONE" ||
1b1dce4b
JS
303 die "Cannot 'squash' without a previous commit"
304
305 mark_action_done
6368f3f8 306 make_squash_message $sha1 > "$MSG"
7c418836
SG
307 failed=f
308 author_script=$(get_author_ident_from_commit HEAD)
309 output git reset --soft HEAD^
310 pick_one -n $sha1 || failed=t
6368f3f8 311 case "$(peek_next_command)" in
f8babc4d 312 squash|s)
6368f3f8 313 EDIT_COMMIT=
91e1ee77 314 USE_OUTPUT=output
7c418836
SG
315 MSG_OPT=-F
316 MSG_FILE="$MSG"
6368f3f8 317 cp "$MSG" "$SQUASH_MSG"
376ccb8c 318 ;;
6368f3f8
JS
319 *)
320 EDIT_COMMIT=-e
91e1ee77 321 USE_OUTPUT=
7c418836
SG
322 MSG_OPT=
323 MSG_FILE=
376ccb8c 324 rm -f "$SQUASH_MSG" || exit
943cea90 325 cp "$MSG" "$GIT_DIR"/SQUASH_MSG
7c418836 326 rm -f "$GIT_DIR"/MERGE_MSG || exit
376ccb8c 327 ;;
6368f3f8 328 esac
18640d99 329 echo "$author_script" > "$DOTEST"/author-script
dbedf972
SP
330 if test $failed = f
331 then
1b1dce4b
JS
332 # This is like --amend, but with a different message
333 eval "$author_script"
ae830ed7
JS
334 GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
335 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
336 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
7c418836 337 $USE_OUTPUT git commit --no-verify $MSG_OPT "$MSG_FILE" $EDIT_COMMIT || failed=t
dbedf972
SP
338 fi
339 if test $failed = t
340 then
1b1dce4b
JS
341 cp "$MSG" "$GIT_DIR"/MERGE_MSG
342 warn
343 warn "Could not apply $sha1... $rest"
1b1dce4b 344 die_with_patch $sha1 ""
dbedf972 345 fi
1b1dce4b
JS
346 ;;
347 *)
348 warn "Unknown command: $command $sha1 $rest"
349 die_with_patch $sha1 "Please fix this in the file $TODO."
376ccb8c 350 ;;
1b1dce4b
JS
351 esac
352 test -s "$TODO" && return
353
68a163c9
JS
354 comment_for_reflog finish &&
355 HEADNAME=$(cat "$DOTEST"/head-name) &&
356 OLDHEAD=$(cat "$DOTEST"/head) &&
357 SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
3b38ec16 358 if test -d "$REWRITTEN"
f09c9b8c
JS
359 then
360 test -f "$DOTEST"/current-commit &&
361 current_commit=$(cat "$DOTEST"/current-commit) &&
362 git rev-parse HEAD > "$REWRITTEN"/$current_commit
34454e85
JS
363 if test -f "$REWRITTEN"/$OLDHEAD
364 then
365 NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD)
366 else
367 NEWHEAD=$OLDHEAD
368 fi
f09c9b8c
JS
369 else
370 NEWHEAD=$(git rev-parse HEAD)
371 fi &&
73697a0b
JS
372 case $HEADNAME in
373 refs/*)
374 message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
375 git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
376 git symbolic-ref HEAD $HEADNAME
377 ;;
378 esac && {
3df0a859 379 test ! -f "$DOTEST"/verbose ||
f3d5e463 380 git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
3df0a859 381 } &&
1b1dce4b 382 rm -rf "$DOTEST" &&
73697a0b 383 git gc --auto &&
1b1dce4b
JS
384 warn "Successfully rebased and updated $HEADNAME."
385
386 exit
387}
388
389do_rest () {
390 while :
391 do
392 do_next
393 done
1b1dce4b
JS
394}
395
7970aaf0
SB
396# check if no other options are set
397is_standalone () {
398 test $# -eq 2 -a "$2" = '--' &&
399 test -z "$ONTO" &&
400 test -z "$PRESERVE_MERGES" &&
401 test -z "$STRATEGY" &&
402 test -z "$VERBOSE"
403}
404
405get_saved_options () {
406 test -d "$REWRITTEN" && PRESERVE_MERGES=t
407 test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
408 test -f "$DOTEST"/verbose && VERBOSE=t
409}
410
822f7c73 411while test $# != 0
1b1dce4b
JS
412do
413 case "$1" in
414 --continue)
7970aaf0
SB
415 is_standalone "$@" || usage
416 get_saved_options
1b1dce4b
JS
417 comment_for_reflog continue
418
419 test -d "$DOTEST" || die "No interactive rebase running"
420
ab119032
JH
421 # Sanity check
422 git rev-parse --verify HEAD >/dev/null ||
423 die "Cannot read HEAD"
6848d58c
JS
424 git update-index --ignore-submodules --refresh &&
425 git diff-files --quiet --ignore-submodules ||
ab119032
JH
426 die "Working tree is dirty"
427
428 # do we have anything to commit?
6848d58c 429 if git diff-index --cached --quiet --ignore-submodules HEAD --
03270628 430 then
ab119032
JH
431 : Nothing to commit -- skip this
432 else
433 . "$DOTEST"/author-script ||
434 die "Cannot find the author identity"
8beb1f33 435 amend=
ab119032
JH
436 if test -f "$DOTEST"/amend
437 then
8beb1f33 438 amend=$(git rev-parse --verify HEAD)
c14c3c82
DP
439 test "$amend" = $(cat "$DOTEST"/amend) ||
440 die "\
441You have uncommitted changes in your working tree. Please, commit them
442first and then run 'git rebase --continue' again."
ab119032
JH
443 git reset --soft HEAD^ ||
444 die "Cannot rewind the HEAD"
445 fi
446 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
8beb1f33
DP
447 git commit --no-verify -F "$DOTEST"/message -e || {
448 test -n "$amend" && git reset --soft $amend
449 die "Could not commit staged changes."
450 }
03270628 451 fi
18640d99 452
1b1dce4b
JS
453 require_clean_work_tree
454 do_rest
455 ;;
456 --abort)
7970aaf0
SB
457 is_standalone "$@" || usage
458 get_saved_options
1b1dce4b
JS
459 comment_for_reflog abort
460
ecfe72ff 461 git rerere clear
1b1dce4b
JS
462 test -d "$DOTEST" || die "No interactive rebase running"
463
464 HEADNAME=$(cat "$DOTEST"/head-name)
465 HEAD=$(cat "$DOTEST"/head)
73697a0b
JS
466 case $HEADNAME in
467 refs/*)
468 git symbolic-ref HEAD $HEADNAME
469 ;;
470 esac &&
dfa49f33 471 output git reset --hard $HEAD &&
1b1dce4b
JS
472 rm -rf "$DOTEST"
473 exit
474 ;;
475 --skip)
7970aaf0
SB
476 is_standalone "$@" || usage
477 get_saved_options
1b1dce4b
JS
478 comment_for_reflog skip
479
ecfe72ff 480 git rerere clear
1b1dce4b
JS
481 test -d "$DOTEST" || die "No interactive rebase running"
482
dfa49f33 483 output git reset --hard && do_rest
1b1dce4b 484 ;;
7970aaf0 485 -s)
1b1dce4b
JS
486 case "$#,$1" in
487 *,*=*)
b5e960b1 488 STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
1b1dce4b
JS
489 1,*)
490 usage ;;
491 *)
492 STRATEGY="-s $2"
493 shift ;;
494 esac
495 ;;
7970aaf0 496 -m)
1b1dce4b
JS
497 # we use merge anyway
498 ;;
7970aaf0 499 -v)
1b1dce4b
JS
500 VERBOSE=t
501 ;;
7970aaf0 502 -p)
f09c9b8c
JS
503 PRESERVE_MERGES=t
504 ;;
7970aaf0 505 -i)
1b1dce4b
JS
506 # yeah, we know
507 ;;
7970aaf0
SB
508 --onto)
509 shift
510 ONTO=$(git rev-parse --verify "$1") ||
511 die "Does not point to a valid commit: $1"
1b1dce4b 512 ;;
7970aaf0
SB
513 --)
514 shift
515 test $# -eq 1 -o $# -eq 2 || usage
1b1dce4b
JS
516 test -d "$DOTEST" &&
517 die "Interactive rebase already started"
518
519 git var GIT_COMMITTER_IDENT >/dev/null ||
520 die "You need to set your committer info first"
521
522 comment_for_reflog start
523
1b1dce4b
JS
524 require_clean_work_tree
525
69e66f55
JS
526 UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
527 test -z "$ONTO" && ONTO=$UPSTREAM
528
3b38ec16 529 if test ! -z "$2"
1b1dce4b 530 then
dfa49f33 531 output git show-ref --verify --quiet "refs/heads/$2" ||
1b1dce4b 532 die "Invalid branchname: $2"
dfa49f33 533 output git checkout "$2" ||
1b1dce4b
JS
534 die "Could not checkout $2"
535 fi
536
537 HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
5166810b
MK
538 mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
539
1b1dce4b 540 : > "$DOTEST"/interactive || die "Could not mark as interactive"
73697a0b
JS
541 git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
542 echo "detached HEAD" > "$DOTEST"/head-name
1b1dce4b
JS
543
544 echo $HEAD > "$DOTEST"/head
545 echo $UPSTREAM > "$DOTEST"/upstream
546 echo $ONTO > "$DOTEST"/onto
8e4a91bd 547 test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
1b1dce4b 548 test t = "$VERBOSE" && : > "$DOTEST"/verbose
3b38ec16 549 if test t = "$PRESERVE_MERGES"
f09c9b8c
JS
550 then
551 # $REWRITTEN contains files for each commit that is
552 # reachable by at least one merge base of $HEAD and
553 # $UPSTREAM. They are not necessarily rewritten, but
554 # their children might be.
555 # This ensures that commits on merged, but otherwise
556 # unrelated side branches are left alone. (Think "X"
557 # in the man page's example.)
558 mkdir "$REWRITTEN" &&
559 for c in $(git merge-base --all $HEAD $UPSTREAM)
560 do
561 echo $ONTO > "$REWRITTEN"/$c ||
562 die "Could not init rewritten commits"
563 done
564 MERGES_OPTION=
565 else
566 MERGES_OPTION=--no-merges
567 fi
1b1dce4b 568
c54b7817
JS
569 SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
570 SHORTHEAD=$(git rev-parse --short $HEAD)
571 SHORTONTO=$(git rev-parse --short $ONTO)
6047a234
JS
572 git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
573 --abbrev=7 --reverse --left-right --cherry-pick \
574 $UPSTREAM...$HEAD | \
575 sed -n "s/^>/pick /p" > "$TODO"
576 cat >> "$TODO" << EOF
577
578# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
1b1dce4b
JS
579#
580# Commands:
88b1f0b8
MV
581# p, pick = use commit
582# e, edit = use commit, but stop for amending
583# s, squash = use commit, but meld into previous commit
82576ddb
JS
584#
585# If you remove a line here THAT COMMIT WILL BE LOST.
6047a234 586# However, if you remove everything, the rebase will be aborted.
82576ddb 587#
1b1dce4b 588EOF
1b1dce4b 589
376ccb8c 590 has_action "$TODO" ||
c54b7817 591 die_abort "Nothing to do"
1b1dce4b
JS
592
593 cp "$TODO" "$TODO".backup
ef0c2abf 594 git_editor "$TODO" ||
1b1dce4b
JS
595 die "Could not execute editor"
596
376ccb8c 597 has_action "$TODO" ||
c54b7817
JS
598 die_abort "Nothing to do"
599
22e40795 600 git update-ref ORIG_HEAD $HEAD
dfa49f33 601 output git checkout $ONTO && do_rest
376ccb8c 602 ;;
1b1dce4b
JS
603 esac
604 shift
605done