1 # This shell script fragment is sourced by git-rebase to implement
2 # its interactive mode. "git rebase --interactive" makes it easy
3 # to fix up commits in the middle of a series and rearrange commits.
5 # Copyright (c) 2006 Johannes E. Schindelin
7 # The original idea comes from Eric W. Biederman, in
8 # https://public-inbox.org/git/m1odwkyuf5.fsf_-_@ebiederm.dsl.xmission.com/
10 # The file containing rebase commands, comments, and empty lines.
11 # This file is created by "git rebase -i" then edited by the user. As
12 # the lines are processed, they are removed from the front of this
13 # file and written to the tail of $done.
14 todo
="$state_dir"/git-rebase-todo
16 # The rebase command lines that have already been processed. A line
17 # is moved here when it is first handled, before any associated user
19 done="$state_dir"/done
21 # The commit message that is planned to be used for any changes that
22 # need to be committed following a user interaction.
23 msg
="$state_dir"/message
25 # The file into which is accumulated the suggested commit message for
26 # squash/fixup commands. When the first of a series of squash/fixups
27 # is seen, the file is created and the commit message from the
28 # previous commit and from the first squash/fixup commit are written
29 # to it. The commit message for each subsequent squash/fixup commit
30 # is appended to the file as it is processed.
32 # The first line of the file is of the form
33 # # This is a combination of $count commits.
34 # where $count is the number of commits whose messages have been
35 # written to the file so far (including the initial "pick" commit).
36 # Each time that a commit message is processed, this line is read and
37 # updated. It is deleted just before the combined commit is made.
38 squash_msg
="$state_dir"/message-squash
40 # If the current series of squash/fixups has not yet included a squash
41 # command, then this file exists and holds the commit message of the
42 # original "pick" commit. (If the series ends without a "squash"
43 # command, then this can be used as the commit message of the combined
44 # commit without opening the editor.)
45 fixup_msg
="$state_dir"/message-fixup
47 # $rewritten is the name of a directory containing files for each
48 # commit that is reachable by at least one merge base of $head and
49 # $upstream. They are not necessarily rewritten, but their children
50 # might be. This ensures that commits on merged, but otherwise
51 # unrelated side branches are left alone. (Think "X" in the man page's
53 rewritten
="$state_dir"/rewritten
55 dropped
="$state_dir"/dropped
58 msgnum
="$state_dir"/msgnum
60 # A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
61 # GIT_AUTHOR_DATE that will be used for the commit that is currently
63 author_script
="$state_dir"/author-script
65 # When an "edit" rebase command is being processed, the SHA1 of the
66 # commit to be edited is recorded in this file. When "git rebase
67 # --continue" is executed, if there are any staged changes then they
68 # will be amended to the HEAD commit, but only provided the HEAD
69 # commit is still the commit to be edited. When any other rebase
70 # command is processed, this file is deleted.
71 amend
="$state_dir"/amend
73 # For the post-rewrite hook, we make a list of rewritten commits and
74 # their new sha1s. The rewritten-pending list keeps the sha1s of
75 # commits that have been processed, but not committed yet,
76 # e.g. because they are waiting for a 'squash' command.
77 rewritten_list
="$state_dir"/rewritten-list
78 rewritten_pending
="$state_dir"/rewritten-pending
80 # Work around Git for Windows' Bash whose "read" does not strip CRLF
81 # and leaves CR at the end instead.
84 strategy_args
=${strategy:+--strategy=$strategy}
85 test -n "$strategy_opts" &&
87 for strategy_opt in '"$strategy_opts"'
89 strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
93 GIT_CHERRY_PICK_HELP
="$resolvemsg"
94 export GIT_CHERRY_PICK_HELP
96 comment_char
=$
(git config
--get core.commentchar
2>/dev
/null
)
97 case "$comment_char" in
104 comment_char
=$
(echo "$comment_char" | cut
-c1)
109 printf '%s\n' "$*" >&2
112 # Output the commit message for the specified commit.
114 git cat-file commit
"$1" |
sed "1,/^$/d"
117 orig_reflog_action
="$GIT_REFLOG_ACTION"
119 comment_for_reflog
() {
120 case "$orig_reflog_action" in
122 GIT_REFLOG_ACTION
="rebase -i ($1)"
123 export GIT_REFLOG_ACTION
129 mark_action_done
() {
130 sed -e 1q
< "$todo" >> "$done"
131 sed -e 1d
< "$todo" >> "$todo".new
132 mv -f "$todo".new
"$todo"
133 new_count
=$
(( $
(git stripspace
--strip-comments <"$done" |
wc -l) ))
134 echo $new_count >"$msgnum"
135 total
=$
(($new_count + $
(git stripspace
--strip-comments <"$todo" |
wc -l)))
137 if test "$last_count" != "$new_count"
139 last_count
=$new_count
140 eval_gettext
"Rebasing (\$new_count/\$total)"; printf "\r"
141 test -z "$verbose" ||
echo
145 # Put the last action marked done at the beginning of the todo list
146 # again. If there has not been an action marked done yet, leave the list of
147 # items on the todo list unchanged.
148 reschedule_last_action
() {
149 tail -n 1 "$done" |
cat - "$todo" >"$todo".new
150 sed -e \
$d <"$done" >"$done".new
151 mv -f "$todo".new
"$todo"
152 mv -f "$done".new
"$done"
155 append_todo_help
() {
158 p, pick <commit> = use commit
159 r, reword <commit> = use commit, but edit the commit message
160 e, edit <commit> = use commit, but stop for amending
161 s, squash <commit> = use commit, but meld into previous commit
162 f, fixup <commit> = like \"squash\", but discard this commit's log message
163 x, exec <commit> = run command (the rest of the line) using shell
164 d, drop <commit> = remove commit
165 l, label <label> = label current HEAD with a name
166 t, reset <label> = reset HEAD to a label
168 These lines can be re-ordered; they are executed from top to bottom.
169 " | git stripspace
--comment-lines >>"$todo"
171 if test $
(get_missing_commit_check_level
) = error
174 Do not remove any line. Use 'drop' explicitly to remove a commit.
175 " | git stripspace
--comment-lines >>"$todo"
178 If you remove a line here THAT COMMIT WILL BE LOST.
179 " | git stripspace
--comment-lines >>"$todo"
184 sha1_and_parents
="$(git rev-list --parents -1 "$1")"
185 case "$sha1_and_parents" in
187 git
diff --cc $sha1_and_parents
190 git diff-tree
-p "$1^!"
195 esac > "$state_dir"/patch
197 commit_message
"$1" > "$msg"
198 test -f "$author_script" ||
199 get_author_ident_from_commit
"$1" > "$author_script"
203 echo "$1" > "$state_dir"/stopped-sha
204 git update-ref REBASE_HEAD
"$1"
210 echo "$1" > "$state_dir"/stopped-sha
211 git update-ref REBASE_HEAD
"$1"
213 git rev-parse
--verify HEAD
> "$amend"
214 gpg_sign_opt_quoted
=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
215 warn
"$(eval_gettext "\
216 You can amend the commit now
, with
218 git commit
--amend \
$gpg_sign_opt_quoted
220 Once you are satisfied with your changes
, run
222 git rebase
--continue")"
234 test -n "$(git stripspace --strip-comments <"$1")"
238 tree
=$
(git rev-parse
-q --verify "$1"^
{tree
} 2>/dev
/null
) ||
{
240 die
"$(eval_gettext "\
$sha1: not a commit that can be picked
")"
242 ptree
=$
(git rev-parse
-q --verify "$1"^^
{tree
} 2>/dev
/null
) ||
243 ptree
=4b825dc642cb6eb9a060e54bf8d69288fbee4904
244 test "$tree" = "$ptree"
249 git rev-parse
--verify --quiet "$1"^
2 >/dev
/null
2>&1
252 # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
253 # GIT_AUTHOR_DATE exported from the current environment.
256 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
261 git_sequence_editor
() {
262 if test -z "$GIT_SEQUENCE_EDITOR"
264 GIT_SEQUENCE_EDITOR
="$(git config sequence.editor)"
265 if [ -z "$GIT_SEQUENCE_EDITOR" ]
267 GIT_SEQUENCE_EDITOR
="$(git var GIT_EDITOR)" ||
return $?
271 eval "$GIT_SEQUENCE_EDITOR" '"$@"'
277 case "$1" in -n) sha1
=$2; ff
= ;; *) sha1
=$1 ;; esac
278 case "$force_rebase" in '') ;; ?
*) ff
= ;; esac
279 output git rev-parse
--verify $sha1 || die
"$(eval_gettext "Invalid commit name
: \
$sha1")"
281 if is_empty_commit
"$sha1"
283 empty_args
="--allow-empty"
286 test -d "$rewritten" &&
287 pick_one_preserving_merges
"$@" && return
288 output
eval git cherry-pick
$allow_rerere_autoupdate $allow_empty_message \
289 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
290 $signoff "$strategy_args" $empty_args $ff "$@"
292 # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule
293 # previous task so this commit is not lost.
295 case "$ret" in [01]) ;; *) reschedule_last_action
;; esac
299 pick_one_preserving_merges
() {
310 sha1
=$
(git rev-parse
$sha1)
312 if test -f "$state_dir"/current-commit
&& test "$fast_forward" = t
314 while read current_commit
316 git rev-parse HEAD
> "$rewritten"/$current_commit
317 done <"$state_dir"/current-commit
318 rm "$state_dir"/current-commit ||
319 die
"$(gettext "Cannot
write current commit
's replacement sha1")"
322 echo $sha1 >> "$state_dir"/current-commit
324 # rewrite parents; if none were rewritten, we can fast-forward.
326 pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
327 if test "$pend" = " "
331 while [ "$pend" != "" ]
333 p=$(expr "$pend" : ' \
([^
]*\
)')
336 if test -f "$rewritten"/$p
338 new_p=$(cat "$rewritten"/$p)
340 # If the todo reordered commits, and our parent is marked for
341 # rewriting, but hasn't been gotten to yet
, assume the user meant to
342 # drop it on top of the current HEAD
345 new_p
=$
(git rev-parse HEAD
)
348 test $p != $new_p && fast_forward
=f
349 case "$new_parents" in
351 ;; # do nothing; that parent is already there
353 new_parents
="$new_parents $new_p"
357 if test -f "$dropped"/$p
360 replacement
="$(cat "$dropped"/$p)"
361 test -z "$replacement" && replacement
=root
362 pend
=" $replacement$pend"
364 new_parents
="$new_parents $p"
368 case $fast_forward in
370 output warn
"$(eval_gettext "Fast-forward to \
$sha1")"
371 output git
reset --hard $sha1 ||
372 die
"$(eval_gettext "Cannot fast-forward to \
$sha1")"
375 first_parent
=$
(expr "$new_parents" : ' \([^ ]*\)')
379 # detach HEAD to current parent
380 output git checkout
$first_parent 2> /dev
/null ||
381 die
"$(eval_gettext "Cannot move HEAD to \
$first_parent")"
384 case "$new_parents" in
386 test "a$1" = a-n
&& die
"$(eval_gettext "Refusing to squash a merge
: \
$sha1")"
389 author_script_content
=$
(get_author_ident_from_commit
$sha1)
390 eval "$author_script_content"
391 msg_content
="$(commit_message $sha1)"
392 # No point in merging the first parent, that's HEAD
393 new_parents
=${new_parents# $first_parent}
394 merge_args
="--no-log --no-ff"
395 if ! do_with_author output
eval \
396 git merge $
{gpg_sign_opt
:+$
(git rev-parse \
397 --sq-quote "$gpg_sign_opt")} \
398 $allow_rerere_autoupdate "$merge_args" \
400 -m "$(git rev-parse --sq-quote "$msg_content")" \
403 printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
404 die_with_patch
$sha1 "$(eval_gettext "Error redoing merge \
$sha1")"
406 echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
409 output
eval git cherry-pick
$allow_rerere_autoupdate \
410 $allow_empty_message \
411 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
412 "$strategy_args" "$@" ||
413 die_with_patch
$sha1 "$(eval_gettext "Could not pick \
$sha1")"
420 this_nth_commit_message
() {
422 eval_gettext
"This is the commit message #\${n}:"
425 skip_nth_commit_message
() {
427 eval_gettext
"The commit message #\${n} will be skipped:"
430 update_squash_messages
() {
431 if test -f "$squash_msg"; then
432 mv "$squash_msg" "$squash_msg".bak ||
exit
434 -e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \
435 -e "q" < "$squash_msg".bak
)+1))
437 printf '%s\n' "$comment_char $(eval_ngettext \
438 "This is a combination of \
$count commit.
" \
439 "This is a combination of \
$count commits.
" \
441 sed -e 1d
-e '2,/^./{
443 }' <"$squash_msg".bak
446 commit_message HEAD
>"$fixup_msg" ||
447 die
"$(eval_gettext "Cannot
write \
$fixup_msg")"
450 printf '%s\n' "$comment_char $(gettext "This is a combination of
2 commits.
")"
451 printf '%s\n' "$comment_char $(gettext "This is the
1st commit message
:")"
460 printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
466 printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
468 # Change the space after the comment character to TAB:
469 commit_message
$2 | git stripspace
--comment-lines |
sed -e 's/ / /'
474 peek_next_command
() {
475 git stripspace
--strip-comments <"$todo" |
sed -n -e 's/ .*//p' -e q
478 # A squash/fixup has failed. Prepare the long version of the squash
479 # commit message, then die_with_patch. This code path requires the
480 # user to edit the combined commit message for all commits that have
481 # been squashed/fixedup so far. So also erase the old squash
482 # messages, effectively causing the combined commit to be used as the
483 # new basis for any further squash/fixups. Args: sha1 rest
484 die_failed_squash
() {
487 mv "$squash_msg" "$msg" ||
exit
489 cp "$msg" "$GIT_DIR"/MERGE_MSG ||
exit
491 warn
"$(eval_gettext "Could not apply \
$sha1... \
$rest")"
492 die_with_patch
$sha1 ""
495 flush_rewritten_pending
() {
496 test -s "$rewritten_pending" ||
return
497 newsha1
="$(git rev-parse HEAD^0)"
498 sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
499 rm -f "$rewritten_pending"
502 record_in_rewritten
() {
503 oldsha1
="$(git rev-parse $1)"
504 echo "$oldsha1" >> "$rewritten_pending"
506 case "$(peek_next_command)" in
510 flush_rewritten_pending
518 if test "$(git rev-parse HEAD)" = "$squash_onto"
520 # Set the correct commit message and author info on the
521 # sentinel root before cherry-picking the original changes
522 # without committing (-n). Finally, update the sentinel again
523 # to include these changes. If the cherry-pick results in a
524 # conflict, this means our behaviour is similar to a standard
525 # failed cherry-pick during rebase, with a dirty index to
526 # resolve before manually running git commit --amend then git
528 git commit
--allow-empty --allow-empty-message --amend \
529 --no-post-rewrite -n -q -C $sha1 $signoff &&
531 git commit
--allow-empty --allow-empty-message \
532 --amend --no-post-rewrite -n -q -C $sha1 $signoff \
533 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
534 die_with_patch
$sha1 "$(eval_gettext "Could not apply \
$sha1... \
$rest")"
537 die_with_patch
$sha1 "$(eval_gettext "Could not apply \
$sha1... \
$rest")"
542 rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha ||
exit
543 read -r command sha1 rest
< "$todo"
545 "$comment_char"*|
''|noop|drop|d
)
549 # Work around CR left by "read" (e.g. with Git for Windows' Bash).
553 comment_for_reflog pick
556 do_pick
$sha1 "$rest"
557 record_in_rewritten
$sha1
560 comment_for_reflog reword
563 do_pick
$sha1 "$rest"
564 git commit
--amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \
565 $allow_empty_message ||
{
566 warn
"$(eval_gettext "\
567 Could not amend commit after successfully picking \
$sha1... \
$rest
568 This is most likely due to an empty commit message
, or the pre-commit hook
569 failed. If the pre-commit hook failed
, you may need to resolve the issue before
570 you are able to reword the commit.
")"
571 exit_with_patch
$sha1 1
573 record_in_rewritten
$sha1
576 comment_for_reflog edit
579 do_pick
$sha1 "$rest"
580 sha1_abbrev
=$
(git rev-parse
--short $sha1)
581 warn
"$(eval_gettext "Stopped
at \
$sha1_abbrev... \
$rest")"
582 exit_with_patch
$sha1 0
593 comment_for_reflog
$squash_style
595 test -f "$done" && has_action
"$done" ||
596 die
"$(eval_gettext "Cannot
'\$squash_style' without a previous commit
")"
599 update_squash_messages
$squash_style $sha1
600 author_script_content
=$
(get_author_ident_from_commit HEAD
)
601 echo "$author_script_content" > "$author_script"
602 eval "$author_script_content"
603 if ! pick_one
-n $sha1
605 git rev-parse
--verify HEAD
>"$amend"
606 die_failed_squash
$sha1 "$rest"
608 case "$(peek_next_command)" in
610 # This is an intermediate commit; its message will only be
611 # used in case of trouble. So use the long version:
612 do_with_author output git commit
--amend --no-verify -F "$squash_msg" \
613 ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
614 die_failed_squash
$sha1 "$rest"
617 # This is the final command of this squash/fixup group
618 if test -f "$fixup_msg"
620 do_with_author git commit
--amend --no-verify -F "$fixup_msg" \
621 ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
622 die_failed_squash
$sha1 "$rest"
624 cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG ||
exit
625 rm -f "$GIT_DIR"/MERGE_MSG
626 do_with_author git commit
--amend --no-verify -F "$GIT_DIR"/SQUASH_MSG
-e \
627 ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
628 die_failed_squash
$sha1 "$rest"
630 rm -f "$squash_msg" "$fixup_msg"
633 record_in_rewritten
$sha1
636 read -r command rest
< "$todo"
638 eval_gettextln
"Executing: \$rest"
639 "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
641 # Run in subshell because require_clean_work_tree can die.
643 (require_clean_work_tree
"rebase" 2>/dev
/null
) || dirty
=t
644 if test "$status" -ne 0
646 warn
"$(eval_gettext "Execution failed
: \
$rest")"
648 warn
"$(gettext "and made changes to the index and
/or the working tree
")"
651 You can fix the problem
, and
then run
653 git rebase
--continue")"
655 if test $status -eq 127 # command not found
660 elif test "$dirty" = t
662 # TRANSLATORS: after these lines is a command to be issued by the user
663 warn
"$(eval_gettext "\
664 Execution succeeded
: \
$rest
665 but left changes to the index and
/or the working tree
666 Commit or stash your changes
, and
then run
668 git rebase
--continue")"
674 warn
"$(eval_gettext "Unknown
command: \
$command \
$sha1 \
$rest")"
675 fixtodo
="$(gettext "Please fix this using
'git rebase --edit-todo'.
")"
676 if git rev-parse
--verify -q "$sha1" >/dev
/null
678 die_with_patch
$sha1 "$fixtodo"
684 test -s "$todo" && return
686 comment_for_reflog finish
&&
687 newhead
=$
(git rev-parse HEAD
) &&
690 message
="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
691 git update-ref
-m "$message" $head_name $newhead $orig_head &&
693 -m "$GIT_REFLOG_ACTION: returning to $head_name" \
697 test ! -f "$state_dir"/verbose ||
698 git diff-tree
--stat $orig_head..HEAD
701 test -s "$rewritten_list" &&
702 git notes copy
--for-rewrite=rebase
< "$rewritten_list" ||
703 true
# we don't care if this copying failed
705 hook
="$(git rev-parse --git-path hooks/post-rewrite)"
706 if test -x "$hook" && test -s "$rewritten_list"; then
707 "$hook" rebase
< "$rewritten_list"
708 true
# we don't care if this hook failed
710 warn
"$(eval_gettext "Successfully rebased and updated \
$head_name.
")"
712 return 1 # not failure; just to break the do_rest loop
715 # can only return 0, when the infinite loop breaks
724 git rebase--helper
--expand-ids
727 collapse_todo_ids
() {
728 git rebase--helper
--shorten-ids
731 # Switch to the branch in $into and notify it in the reflog
733 GIT_REFLOG_ACTION
="$GIT_REFLOG_ACTION: checkout $onto_name"
734 output git checkout
$onto || die_abort
"$(gettext "could not detach HEAD
")"
735 git update-ref ORIG_HEAD
$orig_head
738 get_missing_commit_check_level
() {
739 check_level
=$
(git config
--get rebase.missingCommitsCheck
)
740 check_level
=${check_level:-ignore}
741 # Don't be case sensitive
742 printf '%s' "$check_level" |
tr 'A-Z' 'a-z'
745 # Initiate an action. If the cannot be any
746 # further action it may exec a command
747 # or exit and not return.
749 # TODO: Consider a cleaner return model so it
750 # never exits and always return 0 if process
753 # Parameter 1 is the action to initiate.
755 # Returns 0 if the action was able to complete
756 # and if 1 if further processing is required.
760 if test ! -d "$rewritten"
762 exec git rebase--helper
${force_rebase:+--no-ff} $allow_empty_message \
765 # do we have anything to commit?
766 if git diff-index
--cached --quiet HEAD
--
768 # Nothing to commit -- skip this commit
770 test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
771 rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
772 die
"$(gettext "Could not remove CHERRY_PICK_HEAD
")"
774 if ! test -f "$author_script"
776 gpg_sign_opt_quoted
=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
777 die
"$(eval_gettext "\
778 You have staged changes
in your working tree.
779 If these changes are meant to be
780 squashed into the previous commit
, run
:
782 git commit
--amend \
$gpg_sign_opt_quoted
784 If they are meant to go into a new commit
, run
:
786 git commit \
$gpg_sign_opt_quoted
788 In both cases
, once you
're done, continue with:
790 git rebase --continue
793 . "$author_script" ||
794 die "$(gettext "Error trying to find the author identity to amend commit")"
797 current_head=$(git rev-parse --verify HEAD)
798 test "$current_head" = $(cat "$amend") ||
800 You have uncommitted changes in your working tree. Please commit them
801 first and then run 'git rebase
--continue' again.")"
802 do_with_author git commit --amend --no-verify -F "$msg" -e \
803 ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
804 die "$(gettext "Could not commit staged changes.")"
806 do_with_author git commit --no-verify -F "$msg" -e \
807 ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
808 die "$(gettext "Could not commit staged changes.")"
812 if test -r "$state_dir"/stopped-sha
814 record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
817 require_clean_work_tree "rebase"
824 if test ! -d "$rewritten"
826 exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
833 git stripspace --strip-comments <"$todo" >"$todo".new
834 mv -f "$todo".new "$todo"
838 You are editing the todo file of an ongoing interactive rebase.
839 To continue rebase after editing, run:
840 git rebase --continue
842 " | git stripspace --comment-lines >>"$todo"
844 git_sequence_editor "$todo" ||
845 die "$(gettext "Could not execute editor")"
851 exec git show REBASE_HEAD --
859 setup_reflog_action () {
860 comment_for_reflog start
862 if test ! -z "$switch_to"
864 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
865 output git checkout "$switch_to" -- ||
866 die "$(eval_gettext "Could not checkout \$switch_to")"
868 comment_for_reflog start
872 init_basic_state () {
873 orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
874 mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
875 rm -f "$(git rev-parse --git-path REBASE_HEAD)"
877 : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
881 init_revisions_and_shortrevisions () {
882 shorthead=$(git rev-parse --short $orig_head)
883 shortonto=$(git rev-parse --short $onto)
884 if test -z "$rebase_root"
885 # this is now equivalent to ! -z "$upstream"
887 shortupstream=$(git rev-parse --short $upstream)
888 revisions=$upstream...$orig_head
889 shortrevisions=$shortupstream..$shorthead
891 revisions=$onto...$orig_head
892 shortrevisions=$shorthead
897 test -s "$todo" || echo noop >> "$todo"
898 test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
899 test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
901 todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
902 todocount=${todocount##* }
906 $comment_char $(eval_ngettext \
907 "Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
908 "Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
913 However, if you remove everything, the rebase will be aborted.
915 " | git stripspace --comment-lines >>"$todo"
917 if test -z "$keep_empty"
919 printf '%s
\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
923 has_action "$todo" ||
926 cp "$todo" "$todo".backup
928 git_sequence_editor "$todo" ||
929 die_abort "$(gettext "Could not execute editor")"
931 has_action "$todo" ||
934 git rebase--helper --check-todo-list || {
942 test -d "$rewritten" || test -n "$force_rebase" ||
943 onto="$(git rebase--helper --skip-unnecessary-picks)" ||
944 die "Could not skip unnecessary pick commands"
947 if test -z "$rebase_root" && test ! -d "$rewritten"
949 require_clean_work_tree "rebase"
950 exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
956 git_rebase__interactive () {
957 initiate_action "$action"
959 if test $ret = 0; then
966 init_revisions_and_shortrevisions
968 git rebase--helper --make-script ${keep_empty:+--keep-empty} \
969 $revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
970 die "$(gettext "Could not generate todo list")"
975 git_rebase__interactive__preserve_merges () {
976 initiate_action "$action"
978 if test $ret = 0; then
985 if test -z "$rebase_root"
987 mkdir "$rewritten" &&
988 for c in $(git merge-base --all $orig_head $upstream)
990 echo $onto > "$rewritten"/$c ||
991 die "$(gettext "Could not init rewritten commits")"
994 mkdir "$rewritten" &&
995 echo $onto > "$rewritten"/root ||
996 die "$(gettext "Could not init rewritten commits")"
999 init_revisions_and_shortrevisions
1001 format=$(git config --get rebase.instructionFormat)
1002 # the 'rev-list .. |
sed' requires %m to parse; the instruction requires %H to parse
1003 git rev-list --format="%m%H ${format:-%s}" \
1004 --reverse --left-right --topo-order \
1005 $revisions ${restrict_revision+^$restrict_revision} | \
1007 while read -r sha1 rest
1009 if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
1011 comment_out="$comment_char "
1016 if test -z "$rebase_root"
1019 for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
1021 if test -f "$rewritten"/$p
1029 if test f = "$preserve"
1031 touch "$rewritten"/$sha1
1032 printf '%s
\n' "${comment_out}pick $sha1 $rest" >>"$todo"
1036 # Watch for commits that been dropped by --cherry-pick
1038 # Save all non-cherry-picked changes
1039 git rev-list $revisions --left-right --cherry-pick | \
1040 sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
1041 # Now all commits and note which ones are missing in
1042 # not-cherry-picks and hence being dropped
1043 git rev-list $revisions |
1046 if test -f "$rewritten"/$rev &&
1047 ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
1049 # Use -f2 because if rev-list is telling us this commit is
1050 # not worthwhile, we don't want to track its multiple heads
,
1051 # just the history of its first-parent for others that will
1052 # be rebasing on top of it
1053 git rev-list
--parents -1 $rev | cut
-d' ' -s -f2 > "$dropped"/$rev
1054 sha1
=$
(git rev-list
-1 $rev)
1055 sane_grep
-v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
1056 rm "$rewritten"/$rev