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. 4# 5# Copyright (c) 2006 Johannes E. Schindelin 6# 7# The original idea comes from Eric W. Biederman, in 8# http://article.gmane.org/gmane.comp.version-control.git/22407 9# 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. 14todo="$state_dir"/git-rebase-todo 15 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 18# actions. 19done="$state_dir"/done 20 21# The commit message that is planned to be used for any changes that 22# need to be committed following a user interaction. 23msg="$state_dir"/message 24 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. 31# 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. 38squash_msg="$state_dir"/message-squash 39 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.) 45fixup_msg="$state_dir"/message-fixup 46 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 52# example.) 53rewritten="$state_dir"/rewritten 54 55dropped="$state_dir"/dropped 56 57end="$state_dir"/end 58msgnum="$state_dir"/msgnum 59 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 62# being rebased. 63author_script="$state_dir"/author-script 64 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. 71amend="$state_dir"/amend 72 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. 77rewritten_list="$state_dir"/rewritten-list 78rewritten_pending="$state_dir"/rewritten-pending 79 80# Work around Git for Windows' Bash whose "read" does not strip CRLF 81# and leaves CR at the end instead. 82cr=$(printf "\015") 83 84strategy_args= 85iftest -n"$do_merge" 86then 87 strategy_args=${strategy:+--strategy=$strategy} 88eval' 89 for strategy_opt in '"$strategy_opts"' 90 do 91 strategy_args="$strategy_args-X$(git rev-parse --sq-quote "${strategy_opt#--}")" 92 done 93 ' 94fi 95 96GIT_CHERRY_PICK_HELP="$resolvemsg" 97export GIT_CHERRY_PICK_HELP 98 99comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) 100:${comment_char:=#} 101 102warn () { 103printf'%s\n'"$*">&2 104} 105 106# Output the commit message for the specified commit. 107commit_message () { 108 git cat-file commit "$1"|sed"1,/^$/d" 109} 110 111orig_reflog_action="$GIT_REFLOG_ACTION" 112 113comment_for_reflog () { 114case"$orig_reflog_action"in 115''|rebase*) 116 GIT_REFLOG_ACTION="rebase -i ($1)" 117export GIT_REFLOG_ACTION 118;; 119esac 120} 121 122last_count= 123mark_action_done () { 124sed-e1q <"$todo">>"$done" 125sed-e1d <"$todo">>"$todo".new 126mv-f"$todo".new "$todo" 127 new_count=$(git stripspace --strip-comments <"$done" | wc -l) 128echo$new_count>"$msgnum" 129 total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) 130echo$total>"$end" 131iftest"$last_count"!="$new_count" 132then 133 last_count=$new_count 134printf"Rebasing (%d/%d)\r"$new_count $total 135test -z"$verbose"||echo 136fi 137} 138 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. 142reschedule_last_action () { 143tail-n1"$done"|cat-"$todo">"$todo".new 144sed-e \$d<"$done">"$done".new 145mv-f"$todo".new "$todo" 146mv-f"$done".new "$done" 147} 148 149append_todo_help () { 150 git stripspace --comment-lines>>"$todo"<<\EOF 151 152Commands: 153 p, pick = use commit 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 160 161These lines can be re-ordered; they are executed from top to bottom. 162 163EOF 164 if test$(get_missing_commit_check_level)= error 165 then 166 git stripspace --comment-lines >>"$todo" <<\EOF 167Do not remove any line. Use 'drop' explicitly to remove a commit. 168EOF 169 else 170 git stripspace --comment-lines >>"$todo" <<\EOF 171If you remove a line here THAT COMMIT WILL BE LOST. 172EOF 173 fi 174} 175 176make_patch () { 177 sha1_and_parents="$(git rev-list --parents -1 "$1")" 178 case "$sha1_and_parents" in 179 ?*''?*''?*) 180 git diff --cc$sha1_and_parents 181 ;; 182 ?*''?*) 183 git diff-tree -p "$1^!" 184 ;; 185 *) 186 echo "Root commit" 187 ;; 188 esac > "$state_dir"/patch 189 test -f "$msg" || 190 commit_message "$1" > "$msg" 191 test -f "$author_script" || 192 get_author_ident_from_commit "$1" > "$author_script" 193} 194 195die_with_patch () { 196 echo "$1" > "$state_dir"/stopped-sha 197 make_patch "$1" 198 git rerere 199 die "$2" 200} 201 202exit_with_patch () { 203 echo "$1" > "$state_dir"/stopped-sha 204 make_patch$1 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" 208 warn 209 warn " git commit --amend$gpg_sign_opt_quoted" 210 warn 211 warn "Once you are satisfied with your changes, run" 212 warn 213 warn " git rebase --continue" 214 warn 215 exit$2 216} 217 218die_abort () { 219 rm -rf "$state_dir" 220 die "$1" 221} 222 223has_action () { 224 test -n "$(git stripspace --strip-comments <"$1")" 225} 226 227is_empty_commit() { 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" 233} 234 235is_merge_commit() 236{ 237 git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1 238} 239 240# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and 241# GIT_AUTHOR_DATE exported from the current environment. 242do_with_author () { 243 ( 244 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 245 "$@" 246 ) 247} 248 249git_sequence_editor () { 250 if test -z "$GIT_SEQUENCE_EDITOR" 251 then 252 GIT_SEQUENCE_EDITOR="$(git config sequence.editor)" 253 if [ -z "$GIT_SEQUENCE_EDITOR" ] 254 then 255 GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $? 256 fi 257 fi 258 259 eval "$GIT_SEQUENCE_EDITOR" '"$@"' 260} 261 262pick_one () { 263 ff=--ff 264 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" 268 269 if is_empty_commit "$sha1" 270 then 271 empty_args="--allow-empty" 272 fi 273 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"$@" 279 280 # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule 281 # previous task so this commit is not lost. 282 ret=$? 283 case "$ret" in [01]) ;; *) reschedule_last_action ;; esac 284 return$ret 285} 286 287pick_one_preserving_merges () { 288 fast_forward=t 289 case "$1" in 290 -n) 291 fast_forward=f 292 sha1=$2 293 ;; 294 *) 295 sha1=$1 296 ;; 297 esac 298 sha1=$(git rev-parse $sha1) 299 300 if test -f "$state_dir"/current-commit 301 then 302 if test "$fast_forward" = t 303 then 304 while read current_commit 305 do 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" 310 fi 311 fi 312 313 echo$sha1>> "$state_dir"/current-commit 314 315 # rewrite parents; if none were rewritten, we can fast-forward. 316 new_parents= 317 pend="$(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)" 318 if test "$pend" = "" 319 then 320 pend=" root" 321 fi 322 while [ "$pend" != "" ] 323 do 324 p=$(expr "$pend" : ' \([^ ]*\)') 325 pend="${pend# $p}" 326 327 if test -f "$rewritten"/$p 328 then 329 new_p=$(cat "$rewritten"/$p) 330 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 334 if test -z "$new_p" 335 then 336 new_p=$(git rev-parse HEAD) 337 fi 338 339 test$p!=$new_p&& fast_forward=f 340 case "$new_parents" in 341 *$new_p*) 342 ;; # do nothing; that parent is already there 343 *) 344 new_parents="$new_parents $new_p" 345 ;; 346 esac 347 else 348 if test -f "$dropped"/$p 349 then 350 fast_forward=f 351 replacement="$(cat "$dropped"/$p)" 352 test -z "$replacement" && replacement=root 353 pend="$replacement$pend" 354 else 355 new_parents="$new_parents $p" 356 fi 357 fi 358 done 359 case$fast_forwardin 360 t) 361 output warn "Fast-forward to $sha1" 362 output git reset --hard$sha1|| 363 die "Cannot fast-forward to $sha1" 364 ;; 365 f) 366 first_parent=$(expr "$new_parents" : ' \([^ ]*\)') 367 368 if [ "$1" != "-n" ] 369 then 370 # detach HEAD to current parent 371 output git checkout$first_parent2> /dev/null || 372 die "Cannot move HEAD to $first_parent" 373 fi 374 375 case "$new_parents" in 376 ' '*' '*) 377 test "a$1" = a-n && die "Refusing to squash a merge:$sha1" 378 379 # redo merge 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' 389 then 390 printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG 391 die_with_patch$sha1"Error redoing merge $sha1" 392 fi 393 echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" 394 ;; 395 *) 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" 400 ;; 401 esac 402 ;; 403 esac 404} 405 406nth_string () { 407 case "$1" in 408 *1[0-9]|*[04-9]) echo "$1"th;; 409 *1) echo "$1"st;; 410 *2) echo "$1"nd;; 411 *3) echo "$1"rd;; 412 esac 413} 414 415update_squash_messages () { 416 if test -f "$squash_msg"; then 417 mv "$squash_msg" "$squash_msg".bak || exit 418 count=$(($(sed -n \ 419 -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \ 420 -e "q" < "$squash_msg".bak)+1)) 421 { 422 printf '%s\n' "$comment_char This is a combination of $count commits." 423 sed -e 1d -e '2,/^./{ 424 /^$/d 425 }' <"$squash_msg".bak 426 } >"$squash_msg" 427 else 428 commit_message HEAD > "$fixup_msg" || die "Cannot write$fixup_msg" 429 count=2 430 { 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:" 433 echo 434 cat "$fixup_msg" 435 } >"$squash_msg" 436 fi 437 case$1in 438 squash) 439 rm -f "$fixup_msg" 440 echo 441 printf '%s\n' "$comment_charThis is the$(nth_string $count)commit message:" 442 echo 443 commit_message$2 444 ;; 445 fixup) 446 echo 447 printf '%s\n' "$comment_charThe$(nth_string $count)commit message will be skipped:" 448 echo 449 # Change the space after the comment character to TAB: 450 commit_message$2| git stripspace --comment-lines | sed -e 's/ / /' 451 ;; 452 esac >>"$squash_msg" 453} 454 455peek_next_command () { 456 git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q 457} 458 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 465die_failed_squash() { 466 mv "$squash_msg" "$msg" || exit 467 rm -f "$fixup_msg" 468 cp "$msg" "$GIT_DIR"/MERGE_MSG || exit 469 warn 470 warn "Could not apply$1...$2" 471 die_with_patch$1"" 472} 473 474flush_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" 479} 480 481record_in_rewritten() { 482 oldsha1="$(git rev-parse $1)" 483 echo "$oldsha1" >> "$rewritten_pending" 484 485 case "$(peek_next_command)" in 486 squash|s|fixup|f) 487 ;; 488 *) 489 flush_rewritten_pending 490 ;; 491 esac 492} 493 494do_pick () { 495 if test "$(git rev-parse HEAD)" = "$squash_onto" 496 then 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 504 # rebase --continue. 505 git commit --allow-empty --allow-empty-message --amend \ 506 --no-post-rewrite -n -q -C$1&& 507 pick_one -n$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" 512 else 513 pick_one$1|| 514 die_with_patch$1"Could not apply$1...$2" 515 fi 516} 517 518do_next () { 519 rm -f "$msg" "$author_script" "$amend" || exit 520 read -r command sha1 rest < "$todo" 521 case "$command" in 522 "$comment_char"*|''|noop|drop|d) 523 mark_action_done 524 ;; 525 "$cr") 526 # Work around CR left by "read" (e.g. with Git for Windows' Bash). 527 mark_action_done 528;; 529 pick|p) 530 comment_for_reflog pick 531 532 mark_action_done 533 do_pick $sha1"$rest" 534 record_in_rewritten $sha1 535;; 536 reword|r) 537 comment_for_reflog reword 538 539 mark_action_done 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 $sha11 547} 548 record_in_rewritten $sha1 549;; 550 edit|e) 551 comment_for_reflog edit 552 553 mark_action_done 554 do_pick $sha1"$rest" 555 warn "Stopped at$sha1...$rest" 556 exit_with_patch $sha10 557;; 558 squash|s|fixup|f) 559case"$command"in 560 squash|s) 561 squash_style=squash 562;; 563 fixup|f) 564 squash_style=fixup 565;; 566esac 567 comment_for_reflog $squash_style 568 569test -f"$done"&& has_action "$done"|| 570 die "Cannot '$squash_style' without a previous commit" 571 572 mark_action_done 573 update_squash_messages $squash_style $sha1 574 author_script_content=$(get_author_ident_from_commit HEAD) 575echo"$author_script_content">"$author_script" 576eval"$author_script_content" 577if! pick_one -n$sha1 578then 579 git rev-parse --verify HEAD >"$amend" 580 die_failed_squash $sha1"$rest" 581fi 582case"$(peek_next_command)"in 583 squash|s|fixup|f) 584# This is an intermediate commit; its message will only be 585# used in case of trouble. So use the long version: 586 do_with_author output git commit --amend --no-verify -F"$squash_msg" \ 587${gpg_sign_opt:+"$gpg_sign_opt"}|| 588 die_failed_squash $sha1"$rest" 589;; 590*) 591# This is the final command of this squash/fixup group 592iftest -f"$fixup_msg" 593then 594 do_with_author git commit --amend --no-verify -F"$fixup_msg" \ 595${gpg_sign_opt:+"$gpg_sign_opt"}|| 596 die_failed_squash $sha1"$rest" 597else 598cp"$squash_msg""$GIT_DIR"/SQUASH_MSG ||exit 599rm-f"$GIT_DIR"/MERGE_MSG 600 do_with_author git commit --amend --no-verify -F"$GIT_DIR"/SQUASH_MSG -e \ 601${gpg_sign_opt:+"$gpg_sign_opt"}|| 602 die_failed_squash $sha1"$rest" 603fi 604rm-f"$squash_msg""$fixup_msg" 605;; 606esac 607 record_in_rewritten $sha1 608;; 609 x|"exec") 610read -r command rest <"$todo" 611 mark_action_done 612printf'Executing: %s\n'"$rest" 613# "exec" command doesn't take a sha1 in the todo-list. 614# => can't just use $sha1 here. 615 git rev-parse --verify HEAD >"$state_dir"/stopped-sha 616${SHELL:-@SHELL_PATH@}-c"$rest"# Actual execution 617 status=$? 618# Run in subshell because require_clean_work_tree can die. 619 dirty=f 620(require_clean_work_tree "rebase"2>/dev/null) || dirty=t 621iftest"$status"-ne0 622then 623 warn "Execution failed:$rest" 624test"$dirty"= f || 625 warn "and made changes to the index and/or the working tree" 626 627 warn "You can fix the problem, and then run" 628 warn 629 warn " git rebase --continue" 630 warn 631iftest$status-eq127# command not found 632then 633 status=1 634fi 635exit"$status" 636eliftest"$dirty"= t 637then 638 warn "Execution succeeded:$rest" 639 warn "but left changes to the index and/or the working tree" 640 warn "Commit or stash your changes, and then run" 641 warn 642 warn " git rebase --continue" 643 warn 644exit1 645fi 646;; 647*) 648 warn "Unknown command:$command$sha1$rest" 649 fixtodo="Please fix this using 'git rebase --edit-todo'." 650if git rev-parse --verify -q"$sha1">/dev/null 651then 652 die_with_patch $sha1"$fixtodo" 653else 654 die "$fixtodo" 655fi 656;; 657esac 658test -s"$todo"&&return 659 660 comment_for_reflog finish && 661 newhead=$(git rev-parse HEAD)&& 662case$head_namein 663 refs/*) 664 message="$GIT_REFLOG_ACTION:$head_nameonto$onto"&& 665 git update-ref -m"$message"$head_name $newhead $orig_head&& 666 git symbolic-ref \ 667-m"$GIT_REFLOG_ACTION: returning to$head_name" \ 668 HEAD $head_name 669;; 670esac&& { 671test!-f"$state_dir"/verbose || 672 git diff-tree --stat$orig_head..HEAD 673} && 674{ 675test -s"$rewritten_list"&& 676 git notes copy --for-rewrite=rebase <"$rewritten_list"|| 677 true # we don't care if this copying failed 678} && 679 hook="$(git rev-parse --git-path hooks/post-rewrite)" 680iftest -x"$hook"&&test -s"$rewritten_list";then 681"$hook" rebase <"$rewritten_list" 682 true # we don't care if this hook failed 683fi&& 684 warn "Successfully rebased and updated$head_name." 685 686return1# not failure; just to break the do_rest loop 687} 688 689# can only return 0, when the infinite loop breaks 690do_rest () { 691while: 692do 693 do_next ||break 694done 695} 696 697# skip picking commits whose parents are unchanged 698skip_unnecessary_picks () { 699 fd=3 700whileread -r command rest 701do 702# fd=3 means we skip the command 703case"$fd,$command"in 7043,pick|3,p) 705# pick a commit whose parent is current $onto -> skip 706 sha1=${rest%% *} 707case"$(git rev-parse --verify --quiet "$sha1"^)"in 708"$onto"*) 709 onto=$sha1 710;; 711*) 712 fd=1 713;; 714esac 715;; 7163,"$comment_char"*|3,) 717# copy comments 718;; 719*) 720 fd=1 721;; 722esac 723printf'%s\n'"$command${rest:+ }$rest">&$fd 724done<"$todo">"$todo.new"3>>"$done"&& 725mv-f"$todo".new "$todo"&& 726case"$(peek_next_command)"in 727 squash|s|fixup|f) 728 record_in_rewritten "$onto" 729;; 730esac|| 731 die "Could not skip unnecessary pick commands" 732} 733 734transform_todo_ids () { 735whileread -r command rest 736do 737case"$command"in 738"$comment_char"* |exec) 739# Be careful for oddball commands like 'exec' 740# that do not have a SHA-1 at the beginning of $rest. 741;; 742*) 743 sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[ ]*})&& 744 rest="$sha1${rest#*[ ]}" 745;; 746esac 747printf'%s\n'"$command${rest:+ }$rest" 748done<"$todo">"$todo.new"&& 749mv-f"$todo.new""$todo" 750} 751 752expand_todo_ids() { 753 transform_todo_ids 754} 755 756collapse_todo_ids() { 757 transform_todo_ids --short 758} 759 760# Rearrange the todo list that has both "pick sha1 msg" and 761# "pick sha1 fixup!/squash! msg" appears in it so that the latter 762# comes immediately after the former, and change "pick" to 763# "fixup"/"squash". 764rearrange_squash () { 765# extract fixup!/squash! lines and resolve any referenced sha1's 766whileread -r pick sha1 message 767do 768case"$message"in 769"squash! "*|"fixup! "*) 770 action="${message%%!*}" 771 rest=$message 772 prefix= 773# skip all squash! or fixup! (but save for later) 774while: 775do 776case"$rest"in 777"squash! "*|"fixup! "*) 778 prefix="$prefix${rest%%!*}," 779 rest="${rest#*! }" 780;; 781*) 782break 783;; 784esac 785done 786printf'%s %s %s %s\n'"$sha1""$action""$prefix""$rest" 787# if it's a single word, try to resolve to a full sha1 and 788# emit a second copy. This allows us to match on both message 789# and on sha1 prefix 790iftest"${rest#* }"="$rest";then 791 fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)" 792iftest -n"$fullsha";then 793# prefix the action to uniquely identify this line as 794# intended for full sha1 match 795echo"$sha1+$action$prefix$fullsha" 796fi 797fi 798esac 799done>"$1.sq"<"$1" 800test -s"$1.sq"||return 801 802 used= 803whileread -r pick sha1 message 804do 805case"$used"in 806*"$sha1"*)continue;; 807esac 808printf'%s\n'"$pick$sha1$message" 809 used="$used$sha1" 810whileread -r squash action msg_prefix msg_content 811do 812case"$used"in 813*"$squash"*)continue;; 814esac 815 emit=0 816case"$action"in 817+*) 818 action="${action#+}" 819# full sha1 prefix test 820case"$msg_content"in"$sha1"*) emit=1;;esac;; 821*) 822# message prefix test 823case"$message"in"$msg_content"*) emit=1;;esac;; 824esac 825iftest$emit=1;then 826 real_prefix=$(echo "$msg_prefix" | sed "s/,/! /g") 827printf'%s\n'"$action$squash${real_prefix}$msg_content" 828 used="$used$squash" 829fi 830done<"$1.sq" 831done>"$1.rearranged"<"$1" 832cat"$1.rearranged">"$1" 833rm-f"$1.sq""$1.rearranged" 834} 835 836# Add commands after a pick or after a squash/fixup serie 837# in the todo list. 838add_exec_commands () { 839{ 840 first=t 841whileread -r insn rest 842do 843case$insnin 844 pick) 845test -n"$first"|| 846printf"%s""$cmd" 847;; 848esac 849printf"%s %s\n""$insn""$rest" 850 first= 851done 852printf"%s""$cmd" 853} <"$1">"$1.new"&& 854mv"$1.new""$1" 855} 856 857# Check if the SHA-1 passed as an argument is a 858# correct one, if not then print $2 in "$todo".badsha 859# $1: the SHA-1 to test 860# $2: the line number of the input 861# $3: the input filename 862check_commit_sha () { 863 badsha=0 864iftest -z$1 865then 866 badsha=1 867else 868 sha1_verif="$(git rev-parse --verify --quiet $1^{commit})" 869iftest -z$sha1_verif 870then 871 badsha=1 872fi 873fi 874 875iftest$badsha-ne0 876then 877 line="$(sed -n -e "${2}p" "$3")" 878 warn "Warning: the SHA-1 is missing or isn't" \ 879"a commit in the following line:" 880 warn " -$line" 881 warn 882fi 883 884return$badsha 885} 886 887# prints the bad commits and bad commands 888# from the todolist in stdin 889check_bad_cmd_and_sha () { 890 retval=0 891 lineno=0 892whileread -r command rest 893do 894 lineno=$(( $lineno + 1 )) 895case$commandin 896"$comment_char"*|''|noop|x|exec) 897# Doesn't expect a SHA-1 898;; 899"$cr") 900# Work around CR left by "read" (e.g. with Git for 901# Windows' Bash). 902;; 903 pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f) 904if! check_commit_sha "${rest%%[ ]*}""$lineno""$1" 905then 906 retval=1 907fi 908;; 909*) 910 line="$(sed -n -e "${lineno}p" "$1")" 911 warn "Warning: the command isn't recognized" \ 912"in the following line:" 913 warn " -$line" 914 warn 915 retval=1 916;; 917esac 918done<"$1" 919return$retval 920} 921 922# Print the list of the SHA-1 of the commits 923# from stdin to stdout 924todo_list_to_sha_list () { 925 git stripspace --strip-comments| 926whileread -r command sha1 rest 927do 928case$commandin 929"$comment_char"*|''|noop|x|"exec") 930;; 931*) 932 long_sha=$(git rev-list --no-walk "$sha1" 2>/dev/null) 933printf"%s\n""$long_sha" 934;; 935esac 936done 937} 938 939# Use warn for each line in stdin 940warn_lines () { 941whileread -r line 942do 943 warn " -$line" 944done 945} 946 947# Switch to the branch in $into and notify it in the reflog 948checkout_onto () { 949 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$onto_name" 950 output git checkout $onto|| die_abort "could not detach HEAD" 951 git update-ref ORIG_HEAD $orig_head 952} 953 954get_missing_commit_check_level () { 955 check_level=$(git config --get rebase.missingCommitsCheck) 956 check_level=${check_level:-ignore} 957# Don't be case sensitive 958printf'%s'"$check_level"|tr'A-Z''a-z' 959} 960 961# Check if the user dropped some commits by mistake 962# Behaviour determined by rebase.missingCommitsCheck. 963# Check if there is an unrecognized command or a 964# bad SHA-1 in a command. 965check_todo_list () { 966 raise_error=f 967 968 check_level=$(get_missing_commit_check_level) 969 970case"$check_level"in 971 warn|error) 972# Get the SHA-1 of the commits 973 todo_list_to_sha_list <"$todo".backup >"$todo".oldsha1 974 todo_list_to_sha_list <"$todo">"$todo".newsha1 975 976# Sort the SHA-1 and compare them 977sort-u"$todo".oldsha1 >"$todo".oldsha1+ 978mv"$todo".oldsha1+"$todo".oldsha1 979sort-u"$todo".newsha1 >"$todo".newsha1+ 980mv"$todo".newsha1+"$todo".newsha1 981comm-2 -3"$todo".oldsha1 "$todo".newsha1 >"$todo".miss 982 983# Warn about missing commits 984iftest -s"$todo".miss 985then 986test"$check_level"= error && raise_error=t 987 988 warn "Warning: some commits may have been dropped" \ 989"accidentally." 990 warn "Dropped commits (newer to older):" 991 992# Make the list user-friendly and display 993 opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin" 994 git rev-list$opt<"$todo".miss | warn_lines 995 996 warn "To avoid this message, use\"drop\"to" \ 997"explicitly remove a commit." 998 warn 999 warn "Use 'git config rebase.missingCommitsCheck' to change" \1000"the level of warnings."1001 warn "The possible behaviours are: ignore, warn, error."1002 warn1003fi1004;;1005 ignore)1006;;1007*)1008 warn "Unrecognized setting$check_levelfor option" \1009"rebase.missingCommitsCheck. Ignoring."1010;;1011esac10121013if! check_bad_cmd_and_sha "$todo"1014then1015 raise_error=t1016fi10171018iftest$raise_error= t1019then1020# Checkout before the first commit of the1021# rebase: this way git rebase --continue1022# will work correctly as it expects HEAD to be1023# placed before the commit of the next action1024 checkout_onto10251026 warn "You can fix this with 'git rebase --edit-todo'."1027 die "Or you can abort the rebase with 'git rebase --abort'."1028fi1029}10301031# The whole contents of this file is run by dot-sourcing it from1032# inside a shell function. It used to be that "return"s we see1033# below were not inside any function, and expected to return1034# to the function that dot-sourced us.1035#1036# However, FreeBSD /bin/sh misbehaves on such a construct and1037# continues to run the statements that follow such a "return".1038# As a work-around, we introduce an extra layer of a function1039# here, and immediately call it after defining it.1040git_rebase__interactive () {10411042case"$action"in1043continue)1044# do we have anything to commit?1045if git diff-index --cached --quiet HEAD --1046then1047: Nothing to commit -- skip this1048else1049if!test -f"$author_script"1050then1051 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}1052 die "You have staged changes in your working tree. If these changes are meant to be1053squashed into the previous commit, run:10541055 git commit --amend$gpg_sign_opt_quoted10561057If they are meant to go into a new commit, run:10581059 git commit$gpg_sign_opt_quoted10601061In both case, once you're done, continue with:10621063 git rebase --continue1064"1065fi1066 . "$author_script"||1067 die "Error trying to find the author identity to amend commit"1068iftest -f"$amend"1069then1070 current_head=$(git rev-parse --verify HEAD)1071test"$current_head"=$(cat "$amend")||1072 die "\1073You have uncommitted changes in your working tree. Please, commit them1074first and then run 'git rebase --continue' again."1075 do_with_author git commit --amend --no-verify -F"$msg"-e \1076${gpg_sign_opt:+"$gpg_sign_opt"}||1077 die "Could not commit staged changes."1078else1079 do_with_author git commit --no-verify -F"$msg"-e \1080${gpg_sign_opt:+"$gpg_sign_opt"}||1081 die "Could not commit staged changes."1082fi1083fi10841085 record_in_rewritten "$(cat "$state_dir"/stopped-sha)"10861087 require_clean_work_tree "rebase"1088 do_rest1089return01090;;1091skip)1092 git rerere clear10931094 do_rest1095return01096;;1097edit-todo)1098 git stripspace --strip-comments<"$todo">"$todo".new1099mv-f"$todo".new "$todo"1100 collapse_todo_ids1101 append_todo_help1102 git stripspace --comment-lines>>"$todo"<<\EOF11031104You are editing the todo file of an ongoing interactive rebase.1105To continue rebase after editing, run:1106 git rebase --continue11071108EOF11091110 git_sequence_editor "$todo"||1111 die "Could not execute editor"1112 expand_todo_ids11131114exit1115;;1116esac11171118git var GIT_COMMITTER_IDENT >/dev/null ||1119 die "You need to set your committer info first"11201121comment_for_reflog start11221123iftest!-z"$switch_to"1124then1125 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$switch_to"1126 output git checkout "$switch_to"--||1127 die "Could not checkout$switch_to"11281129 comment_for_reflog start1130fi11311132orig_head=$(git rev-parse --verify HEAD)|| die "No HEAD?"1133mkdir-p"$state_dir"|| die "Could not create temporary$state_dir"11341135: >"$state_dir"/interactive || die "Could not mark as interactive"1136write_basic_state1137iftest t ="$preserve_merges"1138then1139iftest -z"$rebase_root"1140then1141mkdir"$rewritten"&&1142for c in$(git merge-base --all $orig_head $upstream)1143do1144echo$onto>"$rewritten"/$c||1145 die "Could not init rewritten commits"1146done1147else1148mkdir"$rewritten"&&1149echo$onto>"$rewritten"/root ||1150 die "Could not init rewritten commits"1151fi1152# No cherry-pick because our first pass is to determine1153# parents to rewrite and skipping dropped commits would1154# prematurely end our probe1155 merges_option=1156else1157 merges_option="--no-merges --cherry-pick"1158fi11591160shorthead=$(git rev-parse --short $orig_head)1161shortonto=$(git rev-parse --short $onto)1162iftest -z"$rebase_root"1163# this is now equivalent to ! -z "$upstream"1164then1165 shortupstream=$(git rev-parse --short $upstream)1166 revisions=$upstream...$orig_head1167 shortrevisions=$shortupstream..$shorthead1168else1169 revisions=$onto...$orig_head1170 shortrevisions=$shorthead1171fi1172git rev-list$merges_option--pretty=oneline --reverse --left-right --topo-order \1173$revisions ${restrict_revision+^$restrict_revision}| \1174sed-n"s/^>//p"|1175whileread -r sha1 rest1176do11771178iftest -z"$keep_empty"&& is_empty_commit $sha1&& ! is_merge_commit $sha11179then1180 comment_out="$comment_char"1181else1182 comment_out=1183fi11841185iftest t !="$preserve_merges"1186then1187printf'%s\n'"${comment_out}pick$sha1$rest">>"$todo"1188else1189iftest -z"$rebase_root"1190then1191 preserve=t1192for p in$(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)1193do1194iftest -f"$rewritten"/$p1195then1196 preserve=f1197fi1198done1199else1200 preserve=f1201fi1202iftest f ="$preserve"1203then1204touch"$rewritten"/$sha11205printf'%s\n'"${comment_out}pick$sha1$rest">>"$todo"1206fi1207fi1208done12091210# Watch for commits that been dropped by --cherry-pick1211iftest t ="$preserve_merges"1212then1213mkdir"$dropped"1214# Save all non-cherry-picked changes1215 git rev-list$revisions--left-right --cherry-pick| \1216sed-n"s/^>//p">"$state_dir"/not-cherry-picks1217# Now all commits and note which ones are missing in1218# not-cherry-picks and hence being dropped1219 git rev-list$revisions|1220whilereadrev1221do1222iftest -f"$rewritten"/$rev&&test"$(sane_grep "$rev" "$state_dir"/not-cherry-picks)"=""1223then1224# Use -f2 because if rev-list is telling us this commit is1225# not worthwhile, we don't want to track its multiple heads,1226# just the history of its first-parent for others that will1227# be rebasing on top of it1228 git rev-list --parents -1$rev| cut -d' '-s -f2>"$dropped"/$rev1229 sha1=$(git rev-list -1 $rev)1230 sane_grep -v"^[a-z][a-z]*$sha1"<"$todo">"${todo}2";mv"${todo}2""$todo"1231rm"$rewritten"/$rev1232fi1233done1234fi12351236test -s"$todo"||echo noop >>"$todo"1237test -n"$autosquash"&& rearrange_squash "$todo"1238test -n"$cmd"&& add_exec_commands "$todo"12391240todocount=$(git stripspace --strip-comments <"$todo" | wc -l)1241todocount=${todocount##* }12421243cat>>"$todo"<<EOF12441245$comment_charRebase$shortrevisionsonto$shortonto($todocountcommand(s))1246EOF1247append_todo_help1248git stripspace --comment-lines>>"$todo"<<\EOF12491250However,if you remove everything, the rebase will be aborted.12511252EOF12531254iftest -z"$keep_empty"1255then1256printf'%s\n'"$comment_charNote that empty commits are commented out">>"$todo"1257fi125812591260has_action "$todo"||1261return212621263cp"$todo""$todo".backup1264collapse_todo_ids1265git_sequence_editor "$todo"||1266 die_abort "Could not execute editor"12671268has_action "$todo"||1269return212701271check_todo_list12721273expand_todo_ids12741275test -d"$rewritten"||test -n"$force_rebase"|| skip_unnecessary_picks12761277checkout_onto1278do_rest12791280}1281# ... and then we call the whole thing.1282git_rebase__interactive