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 # http://article.gmane.org/gmane.comp.version-control.git/22407
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
81 if test -n "$do_merge"
83 strategy_args
=${strategy:+--strategy=$strategy}
85 for strategy_opt in '"$strategy_opts"'
87 strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
92 GIT_CHERRY_PICK_HELP
="$resolvemsg"
93 export GIT_CHERRY_PICK_HELP
95 comment_char
=$
(git config
--get core.commentchar
2>/dev
/null | cut
-c1)
99 printf '%s\n' "$*" >&2
102 # Output the commit message for the specified commit.
104 git cat-file commit
"$1" |
sed "1,/^$/d"
107 orig_reflog_action
="$GIT_REFLOG_ACTION"
109 comment_for_reflog
() {
110 case "$orig_reflog_action" in
112 GIT_REFLOG_ACTION
="rebase -i ($1)"
113 export GIT_REFLOG_ACTION
119 mark_action_done
() {
120 sed -e 1q
< "$todo" >> "$done"
121 sed -e 1d
< "$todo" >> "$todo".new
122 mv -f "$todo".new
"$todo"
123 new_count
=$
(git stripspace
--strip-comments <"$done" |
wc -l)
124 echo $new_count >"$msgnum"
125 total
=$
(($new_count + $
(git stripspace
--strip-comments <"$todo" |
wc -l)))
127 if test "$last_count" != "$new_count"
129 last_count
=$new_count
130 printf "Rebasing (%d/%d)\r" $new_count $total
131 test -z "$verbose" ||
echo
135 append_todo_help
() {
136 git stripspace
--comment-lines >>"$todo" <<\EOF
140 r
, reword
= use commit
, but edit the commit message
141 e
, edit
= use commit
, but stop
for amending
142 s
, squash
= use commit
, but meld into previous commit
143 f
, fixup
= like
"squash", but discard this commit
's log message
144 x, exec = run command (the rest of the line) using shell
146 These lines can be re-ordered; they are executed from top to bottom.
148 If you remove a line here THAT COMMIT WILL BE LOST.
153 sha1_and_parents="$(git rev-list --parents -1 "$1")"
154 case "$sha1_and_parents" in
156 git diff --cc $sha1_and_parents
159 git diff-tree -p "$1^!"
164 esac > "$state_dir"/patch
166 commit_message "$1" > "$msg"
167 test -f "$author_script" ||
168 get_author_ident_from_commit "$1" > "$author_script"
172 echo "$1" > "$state_dir"/stopped-sha
179 echo "$1" > "$state_dir"/stopped-sha
181 git rev-parse --verify HEAD > "$amend"
182 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
183 warn "You can amend the commit now, with"
185 warn " git commit --amend $gpg_sign_opt_quoted"
187 warn "Once you are satisfied with your changes, run"
189 warn " git rebase --continue"
200 test -n "$(git stripspace --strip-comments <"$1")"
204 tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
205 die "$1: not a commit that can be picked")
206 ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
207 ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
208 test "$tree" = "$ptree"
213 git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
216 # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
217 # GIT_AUTHOR_DATE exported from the current environment.
220 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
225 git_sequence_editor () {
226 if test -z "$GIT_SEQUENCE_EDITOR"
228 GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
229 if [ -z "$GIT_SEQUENCE_EDITOR" ]
231 GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
235 eval "$GIT_SEQUENCE_EDITOR" '"$@"'
241 case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
242 case "$force_rebase" in '') ;; ?*) ff= ;; esac
243 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
245 if is_empty_commit "$sha1"
247 empty_args="--allow-empty"
250 test -d "$rewritten" &&
251 pick_one_preserving_merges "$@" && return
252 output eval git cherry-pick \
253 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
254 "$strategy_args" $empty_args $ff "$@"
257 pick_one_preserving_merges () {
268 sha1=$(git rev-parse $sha1)
270 if test -f "$state_dir"/current-commit
272 if test "$fast_forward" = t
274 while read current_commit
276 git rev-parse HEAD > "$rewritten"/$current_commit
277 done <"$state_dir"/current-commit
278 rm "$state_dir"/current-commit ||
279 die "Cannot write current commit's replacement sha1
"
283 echo $sha1 >> "$state_dir"/current-commit
285 # rewrite parents; if none were rewritten, we can fast-forward.
287 pend=" $
(git rev-list
--parents -1 $sha1 | cut
-d' ' -s -f2-)"
288 if test "$pend" = " "
292 while [ "$pend" != "" ]
294 p=$(expr "$pend" : ' \([^ ]*\)')
297 if test -f "$rewritten"/$p
299 new_p=$(cat "$rewritten"/$p)
301 # If the todo reordered commits, and our parent is marked for
302 # rewriting, but hasn't been gotten to yet, assume the user meant to
303 # drop it on top of the current HEAD
306 new_p=$(git rev-parse HEAD)
309 test $p != $new_p && fast_forward=f
310 case "$new_parents" in
312 ;; # do nothing; that parent is already there
314 new_parents="$new_parents $new_p"
318 if test -f "$dropped"/$p
321 replacement="$
(cat "$dropped"/$p)"
322 test -z "$replacement" && replacement=root
323 pend=" $replacement$pend"
325 new_parents="$new_parents $p"
329 case $fast_forward in
331 output warn "Fast-forward to
$sha1"
332 output git reset --hard $sha1 ||
333 die "Cannot fast-forward to
$sha1"
336 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
340 # detach HEAD to current parent
341 output git checkout $first_parent 2> /dev/null ||
342 die "Cannot move HEAD to
$first_parent"
345 case "$new_parents" in
347 test "a
$1" = a-n && die "Refusing to squash a merge
: $sha1"
350 author_script_content=$(get_author_ident_from_commit $sha1)
351 eval "$author_script_content"
352 msg_content="$
(commit_message
$sha1)"
353 # No point in merging the first parent, that's HEAD
354 new_parents=${new_parents# $first_parent}
355 merge_args="--no-log --no-ff"
356 if ! do_with_author output eval \
357 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \
358 $merge_args $strategy_args -m "$msg_content" $new_parents'
360 printf "%s
\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
361 die_with_patch $sha1 "Error redoing merge
$sha1"
363 echo "$sha1 $
(git rev-parse HEAD^
0)" >> "$rewritten_list"
366 output eval git cherry-pick \
367 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
368 "$strategy_args" "$@
" ||
369 die_with_patch $sha1 "Could not pick
$sha1"
378 *1[0-9]|*[04-9]) echo "$1"th;;
385 update_squash_messages () {
386 if test -f "$squash_msg"; then
387 mv "$squash_msg" "$squash_msg".bak || exit
389 -e "1s
/^. This is a combination of \
(.
*\
) commits\.
/\
1/p
" \
390 -e "q
" < "$squash_msg".bak)+1))
392 printf '%s\n' "$comment_char This is a combination of
$count commits.
"
393 sed -e 1d -e '2,/^./{
395 }' <"$squash_msg".bak
398 commit_message HEAD > "$fixup_msg" || die "Cannot
write $fixup_msg"
401 printf '%s\n' "$comment_char This is a combination of
2 commits.
"
402 printf '%s\n' "$comment_char The first commit
's message is:"
411 printf '%s
\n' "$comment_char This is the $(nth_string $count) commit message:"
417 printf '%s
\n' "$comment_char The $(nth_string $count) commit message will be skipped:"
419 # Change the space after the comment character to TAB:
420 commit_message $2 | git stripspace --comment-lines | sed -e 's
/ / /'
425 peek_next_command () {
426 git stripspace --strip-comments <"$todo" | sed -n -e 's
/ .
*//p
' -e q
429 # A squash/fixup has failed. Prepare the long version of the squash
430 # commit message, then die_with_patch. This code path requires the
431 # user to edit the combined commit message for all commits that have
432 # been squashed/fixedup so far. So also erase the old squash
433 # messages, effectively causing the combined commit to be used as the
434 # new basis for any further squash/fixups. Args: sha1 rest
435 die_failed_squash() {
436 mv "$squash_msg" "$msg" || exit
438 cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
440 warn "Could not apply $1... $2"
444 flush_rewritten_pending() {
445 test -s "$rewritten_pending" || return
446 newsha1="$(git rev-parse HEAD^0)"
447 sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
448 rm -f "$rewritten_pending"
451 record_in_rewritten() {
452 oldsha1="$(git rev-parse $1)"
453 echo "$oldsha1" >> "$rewritten_pending"
455 case "$(peek_next_command)" in
459 flush_rewritten_pending
465 if test "$(git rev-parse HEAD)" = "$squash_onto"
467 # Set the correct commit message and author info on the
468 # sentinel root before cherry-picking the original changes
469 # without committing (-n). Finally, update the sentinel again
470 # to include these changes. If the cherry-pick results in a
471 # conflict, this means our behaviour is similar to a standard
472 # failed cherry-pick during rebase, with a dirty index to
473 # resolve before manually running git commit --amend then git
475 git commit --allow-empty --allow-empty-message --amend \
476 --no-post-rewrite -n -q -C $1 &&
478 git commit --allow-empty --allow-empty-message \
479 --amend --no-post-rewrite -n -q -C $1 \
480 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
481 die_with_patch $1 "Could not apply $1... $2"
484 die_with_patch $1 "Could not apply $1... $2"
489 rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit
490 read -r command sha1 rest < "$todo"
492 "$comment_char"*|''|noop)
496 comment_for_reflog pick
499 do_pick $sha1 "$rest"
500 record_in_rewritten $sha1
503 comment_for_reflog reword
506 do_pick $sha1 "$rest"
507 git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || {
508 warn "Could not amend commit after successfully picking $sha1... $rest"
509 warn "This is most likely due to an empty commit message, or the pre-commit hook"
510 warn "failed. If the pre-commit hook failed, you may need to resolve the issue before"
511 warn "you are able to reword the commit."
512 exit_with_patch $sha1 1
514 record_in_rewritten $sha1
517 comment_for_reflog edit
520 do_pick $sha1 "$rest"
521 warn "Stopped at $sha1... $rest"
522 exit_with_patch $sha1 0
533 comment_for_reflog $squash_style
535 test -f "$done" && has_action "$done" ||
536 die "Cannot '$squash_style' without a previous commit"
539 update_squash_messages $squash_style $sha1
540 author_script_content=$(get_author_ident_from_commit HEAD)
541 echo "$author_script_content" > "$author_script"
542 eval "$author_script_content"
543 if ! pick_one -n $sha1
545 git rev-parse --verify HEAD >"$amend"
546 die_failed_squash $sha1 "$rest"
548 case "$(peek_next_command)" in
550 # This is an intermediate commit; its message will only be
551 # used in case of trouble. So use the long version:
552 do_with_author output git commit --amend --no-verify -F "$squash_msg" \
553 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
554 die_failed_squash $sha1 "$rest"
557 # This is the final command of this squash/fixup group
558 if test -f "$fixup_msg"
560 do_with_author git commit --amend --no-verify -F "$fixup_msg" \
561 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
562 die_failed_squash $sha1 "$rest"
564 cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
565 rm -f "$GIT_DIR"/MERGE_MSG
566 do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
567 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
568 die_failed_squash $sha1 "$rest"
570 rm -f "$squash_msg" "$fixup_msg"
573 record_in_rewritten $sha1
576 read -r command rest < "$todo"
578 printf 'Executing
: %s
\n' "$rest"
579 ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
581 # Run in subshell because require_clean_work_tree can die.
583 (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
584 if test "$status" -ne 0
586 warn "Execution failed: $rest"
588 warn "and made changes to the index and/or the working tree"
590 warn "You can fix the problem, and then run"
592 warn " git rebase --continue"
594 if test $status -eq 127 # command not found
599 elif test "$dirty" = t
601 warn "Execution succeeded: $rest"
602 warn "but left changes to the index and/or the working tree"
603 warn "Commit or stash your changes, and then run"
605 warn " git rebase --continue"
611 warn "Unknown command: $command $sha1 $rest"
612 fixtodo="Please fix this using 'git rebase
--edit-todo'."
613 if git rev-parse --verify -q "$sha1" >/dev/null
615 die_with_patch $sha1 "$fixtodo"
621 test -s "$todo" && return
623 comment_for_reflog finish &&
624 newhead=$(git rev-parse HEAD) &&
627 message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
628 git update-ref -m "$message" $head_name $newhead $orig_head &&
630 -m "$GIT_REFLOG_ACTION: returning to $head_name" \
634 test ! -f "$state_dir"/verbose ||
635 git diff-tree --stat $orig_head..HEAD
638 test -s "$rewritten_list" &&
639 git notes copy --for-rewrite=rebase < "$rewritten_list" ||
640 true # we don't care
if this copying failed
642 if test -x "$GIT_DIR"/hooks
/post-rewrite
&&
643 test -s "$rewritten_list"; then
644 "$GIT_DIR"/hooks
/post-rewrite rebase
< "$rewritten_list"
645 true
# we don't care if this hook failed
647 warn
"Successfully rebased and updated $head_name."
649 return 1 # not failure; just to break the do_rest loop
652 # can only return 0, when the infinite loop breaks
660 # skip picking commits whose parents are unchanged
661 skip_unnecessary_picks
() {
663 while read -r command rest
665 # fd=3 means we skip the command
666 case "$fd,$command" in
668 # pick a commit whose parent is current $onto -> skip
670 case "$(git rev-parse --verify --quiet "$sha1"^)" in
679 3,"$comment_char"*|
3,)
686 printf '%s\n' "$command${rest:+ }$rest" >&$fd
687 done <"$todo" >"$todo.new" 3>>"$done" &&
688 mv -f "$todo".new
"$todo" &&
689 case "$(peek_next_command)" in
691 record_in_rewritten
"$onto"
694 die
"Could not skip unnecessary pick commands"
697 transform_todo_ids
() {
698 while read -r command rest
701 "$comment_char"* |
exec)
702 # Be careful for oddball commands like 'exec'
703 # that do not have a SHA-1 at the beginning of $rest.
706 sha1
=$
(git rev-parse
--verify --quiet "$@" ${rest%% *}) &&
707 rest
="$sha1 ${rest#* }"
710 printf '%s\n' "$command${rest:+ }$rest"
711 done <"$todo" >"$todo.new" &&
712 mv -f "$todo.new" "$todo"
719 collapse_todo_ids
() {
720 transform_todo_ids
--short
723 # Rearrange the todo list that has both "pick sha1 msg" and
724 # "pick sha1 fixup!/squash! msg" appears in it so that the latter
725 # comes immediately after the former, and change "pick" to
727 rearrange_squash
() {
728 # extract fixup!/squash! lines and resolve any referenced sha1's
729 while read -r pick sha1 message
732 "squash! "*|
"fixup! "*)
733 action
="${message%%!*}"
736 # skip all squash! or fixup! (but save for later)
740 "squash! "*|
"fixup! "*)
741 prefix
="$prefix${rest%%!*},"
749 printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
750 # if it's a single word, try to resolve to a full sha1 and
751 # emit a second copy. This allows us to match on both message
753 if test "${rest#* }" = "$rest"; then
754 fullsha
="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
755 if test -n "$fullsha"; then
756 # prefix the action to uniquely identify this line as
757 # intended for full sha1 match
758 echo "$sha1 +$action $prefix $fullsha"
763 test -s "$1.sq" ||
return
766 while read -r pick sha1 message
769 *" $sha1 "*) continue ;;
771 printf '%s\n' "$pick $sha1 $message"
773 while read -r squash action msg_prefix msg_content
776 *" $squash "*) continue ;;
782 # full sha1 prefix test
783 case "$msg_content" in "$sha1"*) emit
=1;; esac ;;
785 # message prefix test
786 case "$message" in "$msg_content"*) emit
=1;; esac ;;
788 if test $emit = 1; then
789 real_prefix
=$
(echo "$msg_prefix" |
sed "s/,/! /g")
790 printf '%s\n' "$action $squash ${real_prefix}$msg_content"
794 done >"$1.rearranged" <"$1"
795 cat "$1.rearranged" >"$1"
796 rm -f "$1.sq" "$1.rearranged"
799 # Add commands after a pick or after a squash/fixup serie
801 add_exec_commands
() {
804 while read -r insn rest
812 printf "%s %s\n" "$insn" "$rest"
820 # The whole contents of this file is run by dot-sourcing it from
821 # inside a shell function. It used to be that "return"s we see
822 # below were not inside any function, and expected to return
823 # to the function that dot-sourced us.
825 # However, FreeBSD /bin/sh misbehaves on such a construct and
826 # continues to run the statements that follow such a "return".
827 # As a work-around, we introduce an extra layer of a function
828 # here, and immediately call it after defining it.
829 git_rebase__interactive
() {
833 # do we have anything to commit?
834 if git diff-index
--cached --quiet HEAD
--
836 : Nothing to commit
-- skip this
838 if ! test -f "$author_script"
840 gpg_sign_opt_quoted
=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
841 die
"You have staged changes in your working tree. If these changes are meant to be
842 squashed into the previous commit, run:
844 git commit --amend $gpg_sign_opt_quoted
846 If they are meant to go into a new commit, run:
848 git commit $gpg_sign_opt_quoted
850 In both case, once you're done, continue with:
852 git rebase --continue
855 .
"$author_script" ||
856 die
"Error trying to find the author identity to amend commit"
859 current_head
=$
(git rev-parse
--verify HEAD
)
860 test "$current_head" = $
(cat "$amend") ||
862 You have uncommitted changes in your working tree. Please, commit them
863 first and then run 'git rebase --continue' again."
864 do_with_author git commit
--amend --no-verify -F "$msg" -e \
865 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
866 die
"Could not commit staged changes."
868 do_with_author git commit
--no-verify -F "$msg" -e \
869 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
870 die
"Could not commit staged changes."
874 if test -r "$state_dir"/stopped-sha
876 record_in_rewritten
"$(cat "$state_dir"/stopped-sha)"
879 require_clean_work_tree
"rebase"
890 git stripspace
--strip-comments <"$todo" >"$todo".new
891 mv -f "$todo".new
"$todo"
894 git stripspace
--comment-lines >>"$todo" <<\EOF
896 You are editing the todo
file of an ongoing interactive rebase.
897 To
continue rebase after editing
, run
:
898 git rebase
--continue
902 git_sequence_editor
"$todo" ||
903 die
"Could not execute editor"
910 git var GIT_COMMITTER_IDENT
>/dev
/null ||
911 die
"You need to set your committer info first"
913 comment_for_reflog start
915 if test ! -z "$switch_to"
917 GIT_REFLOG_ACTION
="$GIT_REFLOG_ACTION: checkout $switch_to"
918 output git checkout
"$switch_to" -- ||
919 die
"Could not checkout $switch_to"
921 comment_for_reflog start
924 orig_head
=$
(git rev-parse
--verify HEAD
) || die
"No HEAD?"
925 mkdir
-p "$state_dir" || die
"Could not create temporary $state_dir"
927 : > "$state_dir"/interactive || die
"Could not mark as interactive"
929 if test t
= "$preserve_merges"
931 if test -z "$rebase_root"
933 mkdir
"$rewritten" &&
934 for c
in $
(git merge-base
--all $orig_head $upstream)
936 echo $onto > "$rewritten"/$c ||
937 die
"Could not init rewritten commits"
940 mkdir
"$rewritten" &&
941 echo $onto > "$rewritten"/root ||
942 die
"Could not init rewritten commits"
944 # No cherry-pick because our first pass is to determine
945 # parents to rewrite and skipping dropped commits would
946 # prematurely end our probe
949 merges_option
="--no-merges --cherry-pick"
952 shorthead
=$
(git rev-parse
--short $orig_head)
953 shortonto
=$
(git rev-parse
--short $onto)
954 if test -z "$rebase_root"
955 # this is now equivalent to ! -z "$upstream"
957 shortupstream
=$
(git rev-parse
--short $upstream)
958 revisions
=$upstream...
$orig_head
959 shortrevisions
=$shortupstream..
$shorthead
961 revisions
=$onto...
$orig_head
962 shortrevisions
=$shorthead
964 git rev-list
$merges_option --pretty=oneline
--abbrev-commit \
965 --abbrev=7 --reverse --left-right --topo-order \
968 while read -r shortsha1 rest
971 if test -z "$keep_empty" && is_empty_commit
$shortsha1 && ! is_merge_commit
$shortsha1
973 comment_out
="$comment_char "
978 if test t
!= "$preserve_merges"
980 printf '%s\n' "${comment_out}pick $shortsha1 $rest" >>"$todo"
982 sha1
=$
(git rev-parse
$shortsha1)
983 if test -z "$rebase_root"
986 for p
in $
(git rev-list
--parents -1 $sha1 | cut
-d' ' -s -f2-)
988 if test -f "$rewritten"/$p
996 if test f
= "$preserve"
998 touch "$rewritten"/$sha1
999 printf '%s\n' "${comment_out}pick $shortsha1 $rest" >>"$todo"
1004 # Watch for commits that been dropped by --cherry-pick
1005 if test t
= "$preserve_merges"
1008 # Save all non-cherry-picked changes
1009 git rev-list
$revisions --left-right --cherry-pick | \
1010 sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
1011 # Now all commits and note which ones are missing in
1012 # not-cherry-picks and hence being dropped
1013 git rev-list
$revisions |
1016 if test -f "$rewritten"/$rev -a "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
1018 # Use -f2 because if rev-list is telling us this commit is
1019 # not worthwhile, we don't want to track its multiple heads,
1020 # just the history of its first-parent for others that will
1021 # be rebasing on top of it
1022 git rev-list
--parents -1 $rev | cut
-d' ' -s -f2 > "$dropped"/$rev
1023 short
=$
(git rev-list
-1 --abbrev-commit --abbrev=7 $rev)
1024 sane_grep
-v "^[a-z][a-z]* $short" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
1025 rm "$rewritten"/$rev
1030 test -s "$todo" ||
echo noop
>> "$todo"
1031 test -n "$autosquash" && rearrange_squash
"$todo"
1032 test -n "$cmd" && add_exec_commands
"$todo"
1036 $comment_char Rebase $shortrevisions onto $shortonto
1039 git stripspace
--comment-lines >>"$todo" <<\EOF
1041 However
, if you remove everything
, the rebase will be aborted.
1045 if test -z "$keep_empty"
1047 printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo"
1051 has_action
"$todo" ||
1054 cp "$todo" "$todo".backup
1055 git_sequence_editor
"$todo" ||
1056 die_abort
"Could not execute editor"
1058 has_action
"$todo" ||
1063 test -d "$rewritten" ||
test -n "$force_rebase" || skip_unnecessary_picks
1065 GIT_REFLOG_ACTION
="$GIT_REFLOG_ACTION: checkout $onto_name"
1066 output git checkout
$onto || die_abort
"could not detach HEAD"
1067 git update-ref ORIG_HEAD
$orig_head
1071 # ... and then we call the whole thing.
1072 git_rebase__interactive