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
80 # Work around Git for Windows' Bash whose "read" does not strip CRLF
81 # and leaves CR at the end instead.
85 if test -n "$do_merge"
87 strategy_args
=${strategy:+--strategy=$strategy}
89 for strategy_opt in '"$strategy_opts"'
91 strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
96 GIT_CHERRY_PICK_HELP
="$resolvemsg"
97 export GIT_CHERRY_PICK_HELP
99 comment_char
=$
(git config
--get core.commentchar
2>/dev
/null | cut
-c1)
103 printf '%s\n' "$*" >&2
106 # Output the commit message for the specified commit.
108 git cat-file commit
"$1" |
sed "1,/^$/d"
111 orig_reflog_action
="$GIT_REFLOG_ACTION"
113 comment_for_reflog
() {
114 case "$orig_reflog_action" in
116 GIT_REFLOG_ACTION
="rebase -i ($1)"
117 export GIT_REFLOG_ACTION
123 mark_action_done
() {
124 sed -e 1q
< "$todo" >> "$done"
125 sed -e 1d
< "$todo" >> "$todo".new
126 mv -f "$todo".new
"$todo"
127 new_count
=$
(git stripspace
--strip-comments <"$done" |
wc -l)
128 echo $new_count >"$msgnum"
129 total
=$
(($new_count + $
(git stripspace
--strip-comments <"$todo" |
wc -l)))
131 if test "$last_count" != "$new_count"
133 last_count
=$new_count
134 printf "Rebasing (%d/%d)\r" $new_count $total
135 test -z "$verbose" ||
echo
139 # Put the last action marked done at the beginning of the todo list
140 # again. If there has not been an action marked done yet, leave the list of
141 # items on the todo list unchanged.
142 reschedule_last_action
() {
143 tail -n 1 "$done" |
cat - "$todo" >"$todo".new
144 sed -e \
$d <"$done" >"$done".new
145 mv -f "$todo".new
"$todo"
146 mv -f "$done".new
"$done"
149 append_todo_help
() {
150 git stripspace
--comment-lines >>"$todo" <<\EOF
154 r
, reword
= use commit
, but edit the commit message
155 e
, edit
= use commit
, but stop
for amending
156 s
, squash
= use commit
, but meld into previous commit
157 f
, fixup
= like
"squash", but discard this commit
's log message
158 x, exec = run command (the rest of the line) using shell
159 d, drop = remove commit
161 These lines can be re-ordered; they are executed from top to bottom.
164 if test $(get_missing_commit_check_level) = error
166 git stripspace --comment-lines >>"$todo" <<\EOF
167 Do not remove any line. Use 'drop
' explicitly to remove a commit.
170 git stripspace --comment-lines >>"$todo" <<\EOF
171 If you remove a line here THAT COMMIT WILL BE LOST.
177 sha1_and_parents="$(git rev-list --parents -1 "$1")"
178 case "$sha1_and_parents" in
180 git diff --cc $sha1_and_parents
183 git diff-tree -p "$1^!"
188 esac > "$state_dir"/patch
190 commit_message "$1" > "$msg"
191 test -f "$author_script" ||
192 get_author_ident_from_commit "$1" > "$author_script"
196 echo "$1" > "$state_dir"/stopped-sha
203 echo "$1" > "$state_dir"/stopped-sha
205 git rev-parse --verify HEAD > "$amend"
206 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
207 warn "You can amend the commit now, with"
209 warn " git commit --amend $gpg_sign_opt_quoted"
211 warn "Once you are satisfied with your changes, run"
213 warn " git rebase --continue"
224 test -n "$(git stripspace --strip-comments <"$1")"
228 tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
229 die "$1: not a commit that can be picked")
230 ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
231 ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
232 test "$tree" = "$ptree"
237 git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
240 # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
241 # GIT_AUTHOR_DATE exported from the current environment.
244 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
249 git_sequence_editor () {
250 if test -z "$GIT_SEQUENCE_EDITOR"
252 GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
253 if [ -z "$GIT_SEQUENCE_EDITOR" ]
255 GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
259 eval "$GIT_SEQUENCE_EDITOR" '"$@"'
265 case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
266 case "$force_rebase" in '') ;; ?*) ff= ;; esac
267 output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
269 if is_empty_commit "$sha1"
271 empty_args="--allow-empty"
274 test -d "$rewritten" &&
275 pick_one_preserving_merges "$@" && return
276 output eval git cherry-pick \
277 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
278 "$strategy_args" $empty_args $ff "$@"
280 # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule
281 # previous task so this commit is not lost.
283 case "$ret" in [01]) ;; *) reschedule_last_action ;; esac
287 pick_one_preserving_merges () {
298 sha1=$(git rev-parse $sha1)
300 if test -f "$state_dir"/current-commit
302 if test "$fast_forward" = t
304 while read current_commit
306 git rev-parse HEAD > "$rewritten"/$current_commit
307 done <"$state_dir"/current-commit
308 rm "$state_dir"/current-commit ||
309 die "Cannot write current commit's replacement sha1
"
313 echo $sha1 >> "$state_dir"/current-commit
315 # rewrite parents; if none were rewritten, we can fast-forward.
317 pend=" $
(git rev-list
--parents -1 $sha1 | cut
-d' ' -s -f2-)"
318 if test "$pend" = " "
322 while [ "$pend" != "" ]
324 p=$(expr "$pend" : ' \([^ ]*\)')
327 if test -f "$rewritten"/$p
329 new_p=$(cat "$rewritten"/$p)
331 # If the todo reordered commits, and our parent is marked for
332 # rewriting, but hasn't been gotten to yet, assume the user meant to
333 # drop it on top of the current HEAD
336 new_p=$(git rev-parse HEAD)
339 test $p != $new_p && fast_forward=f
340 case "$new_parents" in
342 ;; # do nothing; that parent is already there
344 new_parents="$new_parents $new_p"
348 if test -f "$dropped"/$p
351 replacement="$
(cat "$dropped"/$p)"
352 test -z "$replacement" && replacement=root
353 pend=" $replacement$pend"
355 new_parents="$new_parents $p"
359 case $fast_forward in
361 output warn "Fast-forward to
$sha1"
362 output git reset --hard $sha1 ||
363 die "Cannot fast-forward to
$sha1"
366 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
370 # detach HEAD to current parent
371 output git checkout $first_parent 2> /dev/null ||
372 die "Cannot move HEAD to
$first_parent"
375 case "$new_parents" in
377 test "a
$1" = a-n && die "Refusing to squash a merge
: $sha1"
380 author_script_content=$(get_author_ident_from_commit $sha1)
381 eval "$author_script_content"
382 msg_content="$
(commit_message
$sha1)"
383 # No point in merging the first parent, that's HEAD
384 new_parents=${new_parents# $first_parent}
385 merge_args="--no-log --no-ff"
386 if ! do_with_author output eval \
387 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \
388 $merge_args $strategy_args -m "$msg_content" $new_parents'
390 printf "%s
\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
391 die_with_patch $sha1 "Error redoing merge
$sha1"
393 echo "$sha1 $
(git rev-parse HEAD^
0)" >> "$rewritten_list"
396 output eval git cherry-pick \
397 ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
398 "$strategy_args" "$@
" ||
399 die_with_patch $sha1 "Could not pick
$sha1"
408 *1[0-9]|*[04-9]) echo "$1"th;;
415 update_squash_messages () {
416 if test -f "$squash_msg"; then
417 mv "$squash_msg" "$squash_msg".bak || exit
419 -e "1s
/^. This is a combination of \
(.
*\
) commits\.
/\
1/p
" \
420 -e "q
" < "$squash_msg".bak)+1))
422 printf '%s\n' "$comment_char This is a combination of
$count commits.
"
423 sed -e 1d -e '2,/^./{
425 }' <"$squash_msg".bak
428 commit_message HEAD > "$fixup_msg" || die "Cannot
write $fixup_msg"
431 printf '%s\n' "$comment_char This is a combination of
2 commits.
"
432 printf '%s\n' "$comment_char The first commit
's message is:"
441 printf '%s
\n' "$comment_char This is the $(nth_string $count) commit message:"
447 printf '%s
\n' "$comment_char The $(nth_string $count) commit message will be skipped:"
449 # Change the space after the comment character to TAB:
450 commit_message $2 | git stripspace --comment-lines | sed -e 's
/ / /'
455 peek_next_command () {
456 git stripspace --strip-comments <"$todo" | sed -n -e 's
/ .
*//p
' -e q
459 # A squash/fixup has failed. Prepare the long version of the squash
460 # commit message, then die_with_patch. This code path requires the
461 # user to edit the combined commit message for all commits that have
462 # been squashed/fixedup so far. So also erase the old squash
463 # messages, effectively causing the combined commit to be used as the
464 # new basis for any further squash/fixups. Args: sha1 rest
465 die_failed_squash() {
466 mv "$squash_msg" "$msg" || exit
468 cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
470 warn "Could not apply $1... $2"
474 flush_rewritten_pending() {
475 test -s "$rewritten_pending" || return
476 newsha1="$(git rev-parse HEAD^0)"
477 sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
478 rm -f "$rewritten_pending"
481 record_in_rewritten() {
482 oldsha1="$(git rev-parse $1)"
483 echo "$oldsha1" >> "$rewritten_pending"
485 case "$(peek_next_command)" in
489 flush_rewritten_pending
495 if test "$(git rev-parse HEAD)" = "$squash_onto"
497 # Set the correct commit message and author info on the
498 # sentinel root before cherry-picking the original changes
499 # without committing (-n). Finally, update the sentinel again
500 # to include these changes. If the cherry-pick results in a
501 # conflict, this means our behaviour is similar to a standard
502 # failed cherry-pick during rebase, with a dirty index to
503 # resolve before manually running git commit --amend then git
505 git commit --allow-empty --allow-empty-message --amend \
506 --no-post-rewrite -n -q -C $1 &&
508 git commit --allow-empty --allow-empty-message \
509 --amend --no-post-rewrite -n -q -C $1 \
510 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
511 die_with_patch $1 "Could not apply $1... $2"
514 die_with_patch $1 "Could not apply $1... $2"
519 rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit
520 read -r command sha1 rest < "$todo"
522 "$comment_char"*|''|noop|drop|d)
526 # Work around CR left by "read" (e.g. with Git for Windows' Bash
).
530 comment_for_reflog pick
533 do_pick
$sha1 "$rest"
534 record_in_rewritten
$sha1
537 comment_for_reflog reword
540 do_pick
$sha1 "$rest"
541 git commit
--amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} ||
{
542 warn
"Could not amend commit after successfully picking $sha1... $rest"
543 warn
"This is most likely due to an empty commit message, or the pre-commit hook"
544 warn
"failed. If the pre-commit hook failed, you may need to resolve the issue before"
545 warn
"you are able to reword the commit."
546 exit_with_patch
$sha1 1
548 record_in_rewritten
$sha1
551 comment_for_reflog edit
554 do_pick
$sha1 "$rest"
555 sha1_abbrev
=$
(git rev-parse
--short $sha1)
556 warn
"Stopped at $sha1_abbrev... $rest"
557 exit_with_patch
$sha1 0
568 comment_for_reflog
$squash_style
570 test -f "$done" && has_action
"$done" ||
571 die
"Cannot '$squash_style' without a previous commit"
574 update_squash_messages
$squash_style $sha1
575 author_script_content
=$
(get_author_ident_from_commit HEAD
)
576 echo "$author_script_content" > "$author_script"
577 eval "$author_script_content"
578 if ! pick_one
-n $sha1
580 git rev-parse
--verify HEAD
>"$amend"
581 die_failed_squash
$sha1 "$rest"
583 case "$(peek_next_command)" in
585 # This is an intermediate commit; its message will only be
586 # used in case of trouble. So use the long version:
587 do_with_author output git commit
--amend --no-verify -F "$squash_msg" \
588 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
589 die_failed_squash
$sha1 "$rest"
592 # This is the final command of this squash/fixup group
593 if test -f "$fixup_msg"
595 do_with_author git commit
--amend --no-verify -F "$fixup_msg" \
596 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
597 die_failed_squash
$sha1 "$rest"
599 cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG ||
exit
600 rm -f "$GIT_DIR"/MERGE_MSG
601 do_with_author git commit
--amend --no-verify -F "$GIT_DIR"/SQUASH_MSG
-e \
602 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
603 die_failed_squash
$sha1 "$rest"
605 rm -f "$squash_msg" "$fixup_msg"
608 record_in_rewritten
$sha1
611 read -r command rest
< "$todo"
613 printf 'Executing: %s\n' "$rest"
614 "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
616 # Run in subshell because require_clean_work_tree can die.
618 (require_clean_work_tree
"rebase" 2>/dev
/null
) || dirty
=t
619 if test "$status" -ne 0
621 warn
"Execution failed: $rest"
623 warn
"and made changes to the index and/or the working tree"
625 warn
"You can fix the problem, and then run"
627 warn
" git rebase --continue"
629 if test $status -eq 127 # command not found
634 elif test "$dirty" = t
636 warn
"Execution succeeded: $rest"
637 warn
"but left changes to the index and/or the working tree"
638 warn
"Commit or stash your changes, and then run"
640 warn
" git rebase --continue"
646 warn
"Unknown command: $command $sha1 $rest"
647 fixtodo
="Please fix this using 'git rebase --edit-todo'."
648 if git rev-parse
--verify -q "$sha1" >/dev
/null
650 die_with_patch
$sha1 "$fixtodo"
656 test -s "$todo" && return
658 comment_for_reflog finish
&&
659 newhead
=$
(git rev-parse HEAD
) &&
662 message
="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
663 git update-ref
-m "$message" $head_name $newhead $orig_head &&
665 -m "$GIT_REFLOG_ACTION: returning to $head_name" \
669 test ! -f "$state_dir"/verbose ||
670 git diff-tree
--stat $orig_head..HEAD
673 test -s "$rewritten_list" &&
674 git notes copy
--for-rewrite=rebase
< "$rewritten_list" ||
675 true
# we don't care if this copying failed
677 hook
="$(git rev-parse --git-path hooks/post-rewrite)"
678 if test -x "$hook" && test -s "$rewritten_list"; then
679 "$hook" rebase
< "$rewritten_list"
680 true
# we don't care if this hook failed
682 warn
"Successfully rebased and updated $head_name."
684 return 1 # not failure; just to break the do_rest loop
687 # can only return 0, when the infinite loop breaks
695 # skip picking commits whose parents are unchanged
696 skip_unnecessary_picks
() {
698 while read -r command rest
700 # fd=3 means we skip the command
701 case "$fd,$command" in
703 # pick a commit whose parent is current $onto -> skip
705 case "$(git rev-parse --verify --quiet "$sha1"^)" in
714 3,"$comment_char"*|
3,)
721 printf '%s\n' "$command${rest:+ }$rest" >&$fd
722 done <"$todo" >"$todo.new" 3>>"$done" &&
723 mv -f "$todo".new
"$todo" &&
724 case "$(peek_next_command)" in
726 record_in_rewritten
"$onto"
729 die
"Could not skip unnecessary pick commands"
732 transform_todo_ids
() {
733 while read -r command rest
736 "$comment_char"* |
exec)
737 # Be careful for oddball commands like 'exec'
738 # that do not have a SHA-1 at the beginning of $rest.
741 sha1
=$
(git rev-parse
--verify --quiet "$@" ${rest%%[ ]*}) &&
742 rest
="$sha1 ${rest#*[ ]}"
745 printf '%s\n' "$command${rest:+ }$rest"
746 done <"$todo" >"$todo.new" &&
747 mv -f "$todo.new" "$todo"
754 collapse_todo_ids
() {
755 transform_todo_ids
--short
758 # Rearrange the todo list that has both "pick sha1 msg" and
759 # "pick sha1 fixup!/squash! msg" appears in it so that the latter
760 # comes immediately after the former, and change "pick" to
763 # Note that if the config has specified a custom instruction format
764 # each log message will be re-retrieved in order to normalize the
765 # autosquash arrangement
766 rearrange_squash
() {
767 # extract fixup!/squash! lines and resolve any referenced sha1's
768 while read -r pick sha1 message
770 test -z "${format}" || message
=$
(git log
-n 1 --format="%s" ${sha1})
772 "squash! "*|
"fixup! "*)
773 action
="${message%%!*}"
776 # skip all squash! or fixup! (but save for later)
780 "squash! "*|
"fixup! "*)
781 prefix
="$prefix${rest%%!*},"
789 printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
790 # if it's a single word, try to resolve to a full sha1 and
791 # emit a second copy. This allows us to match on both message
793 if test "${rest#* }" = "$rest"; then
794 fullsha
="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
795 if test -n "$fullsha"; then
796 # prefix the action to uniquely identify this line as
797 # intended for full sha1 match
798 echo "$sha1 +$action $prefix $fullsha"
803 test -s "$1.sq" ||
return
806 while read -r pick sha1 message
809 *" $sha1 "*) continue ;;
811 printf '%s\n' "$pick $sha1 $message"
812 test -z "${format}" || message
=$
(git log
-n 1 --format="%s" ${sha1})
814 while read -r squash action msg_prefix msg_content
817 *" $squash "*) continue ;;
823 # full sha1 prefix test
824 case "$msg_content" in "$sha1"*) emit
=1;; esac ;;
826 # message prefix test
827 case "$message" in "$msg_content"*) emit
=1;; esac ;;
829 if test $emit = 1; then
830 if test -n "${format}"
832 msg_content
=$
(git log
-n 1 --format="${format}" ${squash})
834 msg_content
="$(echo "$msg_prefix" | sed "s
/,/! /g
")$msg_content"
836 printf '%s\n' "$action $squash $msg_content"
840 done >"$1.rearranged" <"$1"
841 cat "$1.rearranged" >"$1"
842 rm -f "$1.sq" "$1.rearranged"
845 # Add commands after a pick or after a squash/fixup serie
847 add_exec_commands
() {
850 while read -r insn rest
858 printf "%s %s\n" "$insn" "$rest"
866 # Check if the SHA-1 passed as an argument is a
867 # correct one, if not then print $2 in "$todo".badsha
868 # $1: the SHA-1 to test
869 # $2: the line number of the input
870 # $3: the input filename
871 check_commit_sha
() {
877 sha1_verif
="$(git rev-parse --verify --quiet $1^{commit})"
878 if test -z $sha1_verif
884 if test $badsha -ne 0
886 line
="$(sed -n -e "${2}p
" "$3")"
887 warn
"Warning: the SHA-1 is missing or isn't" \
888 "a commit in the following line:"
896 # prints the bad commits and bad commands
897 # from the todolist in stdin
898 check_bad_cmd_and_sha
() {
901 while read -r command rest
903 lineno
=$
(( $lineno + 1 ))
905 "$comment_char"*|
''|noop|x|
exec)
906 # Doesn't expect a SHA-1
909 # Work around CR left by "read" (e.g. with Git for
912 pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f
)
913 if ! check_commit_sha
"${rest%%[ ]*}" "$lineno" "$1"
919 line
="$(sed -n -e "${lineno}p
" "$1")"
920 warn
"Warning: the command isn't recognized" \
921 "in the following line:"
931 # Print the list of the SHA-1 of the commits
932 # from stdin to stdout
933 todo_list_to_sha_list
() {
934 git stripspace
--strip-comments |
935 while read -r command sha1 rest
938 "$comment_char"*|
''|noop|x|
"exec")
941 long_sha
=$
(git rev-list
--no-walk "$sha1" 2>/dev
/null
)
942 printf "%s\n" "$long_sha"
948 # Use warn for each line in stdin
956 # Switch to the branch in $into and notify it in the reflog
958 GIT_REFLOG_ACTION
="$GIT_REFLOG_ACTION: checkout $onto_name"
959 output git checkout
$onto || die_abort
"could not detach HEAD"
960 git update-ref ORIG_HEAD
$orig_head
963 get_missing_commit_check_level
() {
964 check_level
=$
(git config
--get rebase.missingCommitsCheck
)
965 check_level
=${check_level:-ignore}
966 # Don't be case sensitive
967 printf '%s' "$check_level" |
tr 'A-Z' 'a-z'
970 # Check if the user dropped some commits by mistake
971 # Behaviour determined by rebase.missingCommitsCheck.
972 # Check if there is an unrecognized command or a
973 # bad SHA-1 in a command.
977 check_level
=$
(get_missing_commit_check_level
)
979 case "$check_level" in
981 # Get the SHA-1 of the commits
982 todo_list_to_sha_list
<"$todo".backup
>"$todo".oldsha1
983 todo_list_to_sha_list
<"$todo" >"$todo".newsha1
985 # Sort the SHA-1 and compare them
986 sort -u "$todo".oldsha1
>"$todo".oldsha1
+
987 mv "$todo".oldsha1
+ "$todo".oldsha1
988 sort -u "$todo".newsha1
>"$todo".newsha1
+
989 mv "$todo".newsha1
+ "$todo".newsha1
990 comm -2 -3 "$todo".oldsha1
"$todo".newsha1
>"$todo".miss
992 # Warn about missing commits
993 if test -s "$todo".miss
995 test "$check_level" = error
&& raise_error
=t
997 warn
"Warning: some commits may have been dropped" \
999 warn
"Dropped commits (newer to older):"
1001 # Make the list user-friendly and display
1002 opt
="--no-walk=sorted --format=oneline --abbrev-commit --stdin"
1003 git rev-list
$opt <"$todo".miss | warn_lines
1005 warn
"To avoid this message, use \"drop\" to" \
1006 "explicitly remove a commit."
1008 warn
"Use 'git config rebase.missingCommitsCheck' to change" \
1009 "the level of warnings."
1010 warn
"The possible behaviours are: ignore, warn, error."
1017 warn
"Unrecognized setting $check_level for option" \
1018 "rebase.missingCommitsCheck. Ignoring."
1022 if ! check_bad_cmd_and_sha
"$todo"
1027 if test $raise_error = t
1029 # Checkout before the first commit of the
1030 # rebase: this way git rebase --continue
1031 # will work correctly as it expects HEAD to be
1032 # placed before the commit of the next action
1035 warn
"You can fix this with 'git rebase --edit-todo'."
1036 die
"Or you can abort the rebase with 'git rebase --abort'."
1040 # The whole contents of this file is run by dot-sourcing it from
1041 # inside a shell function. It used to be that "return"s we see
1042 # below were not inside any function, and expected to return
1043 # to the function that dot-sourced us.
1045 # However, FreeBSD /bin/sh misbehaves on such a construct and
1046 # continues to run the statements that follow such a "return".
1047 # As a work-around, we introduce an extra layer of a function
1048 # here, and immediately call it after defining it.
1049 git_rebase__interactive
() {
1053 # do we have anything to commit?
1054 if git diff-index
--cached --quiet HEAD
--
1056 # Nothing to commit -- skip this commit
1058 test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
1059 rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
1060 die
"Could not remove CHERRY_PICK_HEAD"
1062 if ! test -f "$author_script"
1064 gpg_sign_opt_quoted
=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
1065 die
"You have staged changes in your working tree. If these changes are meant to be
1066 squashed into the previous commit, run:
1068 git commit --amend $gpg_sign_opt_quoted
1070 If they are meant to go into a new commit, run:
1072 git commit $gpg_sign_opt_quoted
1074 In both case, once you're done, continue with:
1076 git rebase --continue
1079 .
"$author_script" ||
1080 die
"Error trying to find the author identity to amend commit"
1083 current_head
=$
(git rev-parse
--verify HEAD
)
1084 test "$current_head" = $
(cat "$amend") ||
1086 You have uncommitted changes in your working tree. Please, commit them
1087 first and then run 'git rebase --continue' again."
1088 do_with_author git commit
--amend --no-verify -F "$msg" -e \
1089 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
1090 die
"Could not commit staged changes."
1092 do_with_author git commit
--no-verify -F "$msg" -e \
1093 ${gpg_sign_opt:+"$gpg_sign_opt"} ||
1094 die
"Could not commit staged changes."
1098 if test -r "$state_dir"/stopped-sha
1100 record_in_rewritten
"$(cat "$state_dir"/stopped-sha)"
1103 require_clean_work_tree
"rebase"
1114 git stripspace
--strip-comments <"$todo" >"$todo".new
1115 mv -f "$todo".new
"$todo"
1118 git stripspace
--comment-lines >>"$todo" <<\EOF
1120 You are editing the todo
file of an ongoing interactive rebase.
1121 To
continue rebase after editing
, run
:
1122 git rebase
--continue
1126 git_sequence_editor
"$todo" ||
1127 die
"Could not execute editor"
1134 git var GIT_COMMITTER_IDENT
>/dev
/null ||
1135 die
"You need to set your committer info first"
1137 comment_for_reflog start
1139 if test ! -z "$switch_to"
1141 GIT_REFLOG_ACTION
="$GIT_REFLOG_ACTION: checkout $switch_to"
1142 output git checkout
"$switch_to" -- ||
1143 die
"Could not checkout $switch_to"
1145 comment_for_reflog start
1148 orig_head
=$
(git rev-parse
--verify HEAD
) || die
"No HEAD?"
1149 mkdir
-p "$state_dir" || die
"Could not create temporary $state_dir"
1151 : > "$state_dir"/interactive || die
"Could not mark as interactive"
1153 if test t
= "$preserve_merges"
1155 if test -z "$rebase_root"
1157 mkdir
"$rewritten" &&
1158 for c
in $
(git merge-base
--all $orig_head $upstream)
1160 echo $onto > "$rewritten"/$c ||
1161 die
"Could not init rewritten commits"
1164 mkdir
"$rewritten" &&
1165 echo $onto > "$rewritten"/root ||
1166 die
"Could not init rewritten commits"
1168 # No cherry-pick because our first pass is to determine
1169 # parents to rewrite and skipping dropped commits would
1170 # prematurely end our probe
1173 merges_option
="--no-merges --cherry-pick"
1176 shorthead
=$
(git rev-parse
--short $orig_head)
1177 shortonto
=$
(git rev-parse
--short $onto)
1178 if test -z "$rebase_root"
1179 # this is now equivalent to ! -z "$upstream"
1181 shortupstream
=$
(git rev-parse
--short $upstream)
1182 revisions
=$upstream...
$orig_head
1183 shortrevisions
=$shortupstream..
$shorthead
1185 revisions
=$onto...
$orig_head
1186 shortrevisions
=$shorthead
1188 format
=$
(git config
--get rebase.instructionFormat
)
1189 # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
1190 git rev-list
$merges_option --format="%m%H ${format:-%s}" \
1191 --reverse --left-right --topo-order \
1192 $revisions ${restrict_revision+^$restrict_revision} | \
1194 while read -r sha1 rest
1197 if test -z "$keep_empty" && is_empty_commit
$sha1 && ! is_merge_commit
$sha1
1199 comment_out
="$comment_char "
1204 if test t
!= "$preserve_merges"
1206 printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
1208 if test -z "$rebase_root"
1211 for p
in $
(git rev-list
--parents -1 $sha1 | cut
-d' ' -s -f2-)
1213 if test -f "$rewritten"/$p
1221 if test f
= "$preserve"
1223 touch "$rewritten"/$sha1
1224 printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
1229 # Watch for commits that been dropped by --cherry-pick
1230 if test t
= "$preserve_merges"
1233 # Save all non-cherry-picked changes
1234 git rev-list
$revisions --left-right --cherry-pick | \
1235 sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
1236 # Now all commits and note which ones are missing in
1237 # not-cherry-picks and hence being dropped
1238 git rev-list
$revisions |
1241 if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
1243 # Use -f2 because if rev-list is telling us this commit is
1244 # not worthwhile, we don't want to track its multiple heads,
1245 # just the history of its first-parent for others that will
1246 # be rebasing on top of it
1247 git rev-list
--parents -1 $rev | cut
-d' ' -s -f2 > "$dropped"/$rev
1248 sha1
=$
(git rev-list
-1 $rev)
1249 sane_grep
-v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
1250 rm "$rewritten"/$rev
1255 test -s "$todo" ||
echo noop
>> "$todo"
1256 test -n "$autosquash" && rearrange_squash
"$todo"
1257 test -n "$cmd" && add_exec_commands
"$todo"
1259 todocount
=$
(git stripspace
--strip-comments <"$todo" |
wc -l)
1260 todocount
=${todocount##* }
1264 $comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
1267 git stripspace
--comment-lines >>"$todo" <<\EOF
1269 However
, if you remove everything
, the rebase will be aborted.
1273 if test -z "$keep_empty"
1275 printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo"
1279 has_action
"$todo" ||
1282 cp "$todo" "$todo".backup
1284 git_sequence_editor
"$todo" ||
1285 die_abort
"Could not execute editor"
1287 has_action
"$todo" ||
1294 test -d "$rewritten" ||
test -n "$force_rebase" || skip_unnecessary_picks
1300 # ... and then we call the whole thing.
1301 git_rebase__interactive