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 80strategy_args= 81iftest -n"$do_merge" 82then 83 strategy_args=${strategy:+--strategy=$strategy} 84eval' 85 for strategy_opt in '"$strategy_opts"' 86 do 87 strategy_args="$strategy_args-X$(git rev-parse --sq-quote "${strategy_opt#--}")" 88 done 89 ' 90fi 91 92GIT_CHERRY_PICK_HELP="$resolvemsg" 93export GIT_CHERRY_PICK_HELP 94 95comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) 96:${comment_char:=#} 97 98warn () { 99printf'%s\n'"$*">&2 100} 101 102# Output the commit message for the specified commit. 103commit_message () { 104 git cat-file commit "$1"|sed"1,/^$/d" 105} 106 107orig_reflog_action="$GIT_REFLOG_ACTION" 108 109comment_for_reflog () { 110case"$orig_reflog_action"in 111''|rebase*) 112 GIT_REFLOG_ACTION="rebase -i ($1)" 113export GIT_REFLOG_ACTION 114;; 115esac 116} 117 118last_count= 119mark_action_done () { 120sed-e1q <"$todo">>"$done" 121sed-e1d <"$todo">>"$todo".new 122mv-f"$todo".new "$todo" 123 new_count=$(git stripspace --strip-comments <"$done" | wc -l) 124echo$new_count>"$msgnum" 125 total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) 126echo$total>"$end" 127iftest"$last_count"!="$new_count" 128then 129 last_count=$new_count 130printf"Rebasing (%d/%d)\r"$new_count $total 131test -z"$verbose"||echo 132fi 133} 134 135# Put the last action marked done at the beginning of the todo list 136# again. If there has not been an action marked done yet, leave the list of 137# items on the todo list unchanged. 138reschedule_last_action () { 139tail-n1"$done"|cat-"$todo">"$todo".new 140sed-e \$d<"$done">"$done".new 141mv-f"$todo".new "$todo" 142mv-f"$done".new "$done" 143} 144 145append_todo_help () { 146 git stripspace --comment-lines>>"$todo"<<\EOF 147 148Commands: 149 p, pick = use commit 150 r, reword = use commit, but edit the commit message 151 e, edit = use commit, but stop for amending 152 s, squash = use commit, but meld into previous commit 153 f, fixup = like "squash", but discard this commit's log message 154 x, exec = run command (the rest of the line) using shell 155 d, drop = remove commit 156 157These lines can be re-ordered; they are executed from top to bottom. 158 159EOF 160 if test$(get_missing_commit_check_level)= error 161 then 162 git stripspace --comment-lines >>"$todo" <<\EOF 163Do not remove any line. Use 'drop' explicitly to remove a commit. 164EOF 165 else 166 git stripspace --comment-lines >>"$todo" <<\EOF 167If you remove a line here THAT COMMIT WILL BE LOST. 168EOF 169 fi 170} 171 172make_patch () { 173 sha1_and_parents="$(git rev-list --parents -1 "$1")" 174 case "$sha1_and_parents" in 175 ?*''?*''?*) 176 git diff --cc$sha1_and_parents 177 ;; 178 ?*''?*) 179 git diff-tree -p "$1^!" 180 ;; 181 *) 182 echo "Root commit" 183 ;; 184 esac > "$state_dir"/patch 185 test -f "$msg" || 186 commit_message "$1" > "$msg" 187 test -f "$author_script" || 188 get_author_ident_from_commit "$1" > "$author_script" 189} 190 191die_with_patch () { 192 echo "$1" > "$state_dir"/stopped-sha 193 make_patch "$1" 194 git rerere 195 die "$2" 196} 197 198exit_with_patch () { 199 echo "$1" > "$state_dir"/stopped-sha 200 make_patch$1 201 git rev-parse --verify HEAD > "$amend" 202 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} 203 warn "You can amend the commit now, with" 204 warn 205 warn " git commit --amend$gpg_sign_opt_quoted" 206 warn 207 warn "Once you are satisfied with your changes, run" 208 warn 209 warn " git rebase --continue" 210 warn 211 exit$2 212} 213 214die_abort () { 215 rm -rf "$state_dir" 216 die "$1" 217} 218 219has_action () { 220 test -n "$(git stripspace --strip-comments <"$1")" 221} 222 223is_empty_commit() { 224 tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null || 225 die "$1: not a commit that can be picked") 226 ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null || 227 ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904) 228 test "$tree" = "$ptree" 229} 230 231is_merge_commit() 232{ 233 git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1 234} 235 236# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and 237# GIT_AUTHOR_DATE exported from the current environment. 238do_with_author () { 239 ( 240 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 241 "$@" 242 ) 243} 244 245git_sequence_editor () { 246 if test -z "$GIT_SEQUENCE_EDITOR" 247 then 248 GIT_SEQUENCE_EDITOR="$(git config sequence.editor)" 249 if [ -z "$GIT_SEQUENCE_EDITOR" ] 250 then 251 GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $? 252 fi 253 fi 254 255 eval "$GIT_SEQUENCE_EDITOR" '"$@"' 256} 257 258pick_one () { 259 ff=--ff 260 261 case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1;; esac 262 case "$force_rebase" in '') ;; ?*) ff= ;; esac 263 output git rev-parse --verify$sha1|| die "Invalid commit name:$sha1" 264 265 if is_empty_commit "$sha1" 266 then 267 empty_args="--allow-empty" 268 fi 269 270 test -d "$rewritten" && 271 pick_one_preserving_merges "$@" && return 272 output eval git cherry-pick \ 273${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}\ 274 "$strategy_args"$empty_args$ff"$@" 275 276 # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule 277 # previous task so this commit is not lost. 278 ret=$? 279 case "$ret" in [01]) ;; *) reschedule_last_action ;; esac 280 return$ret 281} 282 283pick_one_preserving_merges () { 284 fast_forward=t 285 case "$1" in 286 -n) 287 fast_forward=f 288 sha1=$2 289 ;; 290 *) 291 sha1=$1 292 ;; 293 esac 294 sha1=$(git rev-parse $sha1) 295 296 if test -f "$state_dir"/current-commit 297 then 298 if test "$fast_forward" = t 299 then 300 while read current_commit 301 do 302 git rev-parse HEAD > "$rewritten"/$current_commit 303 done <"$state_dir"/current-commit 304 rm "$state_dir"/current-commit || 305 die "Cannot write current commit's replacement sha1" 306 fi 307 fi 308 309 echo$sha1>> "$state_dir"/current-commit 310 311 # rewrite parents; if none were rewritten, we can fast-forward. 312 new_parents= 313 pend="$(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)" 314 if test "$pend" = "" 315 then 316 pend=" root" 317 fi 318 while [ "$pend" != "" ] 319 do 320 p=$(expr "$pend" : ' \([^ ]*\)') 321 pend="${pend# $p}" 322 323 if test -f "$rewritten"/$p 324 then 325 new_p=$(cat "$rewritten"/$p) 326 327 # If the todo reordered commits, and our parent is marked for 328 # rewriting, but hasn't been gotten to yet, assume the user meant to 329 # drop it on top of the current HEAD 330 if test -z "$new_p" 331 then 332 new_p=$(git rev-parse HEAD) 333 fi 334 335 test$p!=$new_p&& fast_forward=f 336 case "$new_parents" in 337 *$new_p*) 338 ;; # do nothing; that parent is already there 339 *) 340 new_parents="$new_parents $new_p" 341 ;; 342 esac 343 else 344 if test -f "$dropped"/$p 345 then 346 fast_forward=f 347 replacement="$(cat "$dropped"/$p)" 348 test -z "$replacement" && replacement=root 349 pend="$replacement$pend" 350 else 351 new_parents="$new_parents $p" 352 fi 353 fi 354 done 355 case$fast_forwardin 356 t) 357 output warn "Fast-forward to $sha1" 358 output git reset --hard$sha1|| 359 die "Cannot fast-forward to $sha1" 360 ;; 361 f) 362 first_parent=$(expr "$new_parents" : ' \([^ ]*\)') 363 364 if [ "$1" != "-n" ] 365 then 366 # detach HEAD to current parent 367 output git checkout$first_parent2> /dev/null || 368 die "Cannot move HEAD to $first_parent" 369 fi 370 371 case "$new_parents" in 372 ' '*' '*) 373 test "a$1" = a-n && die "Refusing to squash a merge:$sha1" 374 375 # redo merge 376 author_script_content=$(get_author_ident_from_commit $sha1) 377 eval "$author_script_content" 378 msg_content="$(commit_message $sha1)" 379 # No point in merging the first parent, that's HEAD 380 new_parents=${new_parents# $first_parent} 381 merge_args="--no-log --no-ff" 382 if ! do_with_author output eval \ 383 'git merge${gpg_sign_opt:+"$gpg_sign_opt"}\ 384$merge_args$strategy_args-m "$msg_content"$new_parents' 385 then 386 printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG 387 die_with_patch$sha1"Error redoing merge $sha1" 388 fi 389 echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" 390 ;; 391 *) 392 output eval git cherry-pick \ 393${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}\ 394 "$strategy_args" "$@" || 395 die_with_patch$sha1"Could not pick $sha1" 396 ;; 397 esac 398 ;; 399 esac 400} 401 402nth_string () { 403 case "$1" in 404 *1[0-9]|*[04-9]) echo "$1"th;; 405 *1) echo "$1"st;; 406 *2) echo "$1"nd;; 407 *3) echo "$1"rd;; 408 esac 409} 410 411update_squash_messages () { 412 if test -f "$squash_msg"; then 413 mv "$squash_msg" "$squash_msg".bak || exit 414 count=$(($(sed -n \ 415 -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \ 416 -e "q" < "$squash_msg".bak)+1)) 417 { 418 printf '%s\n' "$comment_char This is a combination of $count commits." 419 sed -e 1d -e '2,/^./{ 420 /^$/d 421 }' <"$squash_msg".bak 422 } >"$squash_msg" 423 else 424 commit_message HEAD > "$fixup_msg" || die "Cannot write$fixup_msg" 425 count=2 426 { 427 printf '%s\n' "$comment_char This is a combination of 2 commits." 428 printf '%s\n' "$comment_char The first commit's message is:" 429 echo 430 cat "$fixup_msg" 431 } >"$squash_msg" 432 fi 433 case$1in 434 squash) 435 rm -f "$fixup_msg" 436 echo 437 printf '%s\n' "$comment_charThis is the$(nth_string $count)commit message:" 438 echo 439 commit_message$2 440 ;; 441 fixup) 442 echo 443 printf '%s\n' "$comment_charThe$(nth_string $count)commit message will be skipped:" 444 echo 445 # Change the space after the comment character to TAB: 446 commit_message$2| git stripspace --comment-lines | sed -e 's/ / /' 447 ;; 448 esac >>"$squash_msg" 449} 450 451peek_next_command () { 452 git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q 453} 454 455# A squash/fixup has failed. Prepare the long version of the squash 456# commit message, then die_with_patch. This code path requires the 457# user to edit the combined commit message for all commits that have 458# been squashed/fixedup so far. So also erase the old squash 459# messages, effectively causing the combined commit to be used as the 460# new basis for any further squash/fixups. Args: sha1 rest 461die_failed_squash() { 462 mv "$squash_msg" "$msg" || exit 463 rm -f "$fixup_msg" 464 cp "$msg" "$GIT_DIR"/MERGE_MSG || exit 465 warn 466 warn "Could not apply$1...$2" 467 die_with_patch$1"" 468} 469 470flush_rewritten_pending() { 471 test -s "$rewritten_pending" || return 472 newsha1="$(git rev-parse HEAD^0)" 473 sed "s/$/$newsha1/" < "$rewritten_pending" >> "$rewritten_list" 474 rm -f "$rewritten_pending" 475} 476 477record_in_rewritten() { 478 oldsha1="$(git rev-parse $1)" 479 echo "$oldsha1" >> "$rewritten_pending" 480 481 case "$(peek_next_command)" in 482 squash|s|fixup|f) 483 ;; 484 *) 485 flush_rewritten_pending 486 ;; 487 esac 488} 489 490do_pick () { 491 if test "$(git rev-parse HEAD)" = "$squash_onto" 492 then 493 # Set the correct commit message and author info on the 494 # sentinel root before cherry-picking the original changes 495 # without committing (-n). Finally, update the sentinel again 496 # to include these changes. If the cherry-pick results in a 497 # conflict, this means our behaviour is similar to a standard 498 # failed cherry-pick during rebase, with a dirty index to 499 # resolve before manually running git commit --amend then git 500 # rebase --continue. 501 git commit --allow-empty --allow-empty-message --amend \ 502 --no-post-rewrite -n -q -C$1&& 503 pick_one -n$1&& 504 git commit --allow-empty --allow-empty-message \ 505 --amend --no-post-rewrite -n -q -C$1\ 506${gpg_sign_opt:+"$gpg_sign_opt"}|| 507 die_with_patch$1"Could not apply$1...$2" 508 else 509 pick_one$1|| 510 die_with_patch$1"Could not apply$1...$2" 511 fi 512} 513 514do_next () { 515 rm -f "$msg" "$author_script" "$amend" || exit 516 read -r command sha1 rest < "$todo" 517 case "$command" in 518 "$comment_char"*|''|noop|drop|d) 519 mark_action_done 520 ;; 521 pick|p) 522 comment_for_reflog pick 523 524 mark_action_done 525 do_pick$sha1"$rest" 526 record_in_rewritten$sha1 527 ;; 528 reword|r) 529 comment_for_reflog reword 530 531 mark_action_done 532 do_pick$sha1"$rest" 533 git commit --amend --no-post-rewrite${gpg_sign_opt:+"$gpg_sign_opt"}|| { 534 warn "Could not amend commit after successfully picking$sha1...$rest" 535 warn "This is most likely due to an empty commit message, or the pre-commit hook" 536 warn "failed. If the pre-commit hook failed, you may need to resolve the issue before" 537 warn "you are able to reword the commit." 538 exit_with_patch$sha11 539 } 540 record_in_rewritten$sha1 541 ;; 542 edit|e) 543 comment_for_reflog edit 544 545 mark_action_done 546 do_pick$sha1"$rest" 547 warn "Stopped at$sha1...$rest" 548 exit_with_patch$sha10 549 ;; 550 squash|s|fixup|f) 551 case "$command" in 552 squash|s) 553 squash_style=squash 554 ;; 555 fixup|f) 556 squash_style=fixup 557 ;; 558 esac 559 comment_for_reflog$squash_style 560 561 test -f "$done" && has_action "$done" || 562 die "Cannot '$squash_style' without a previous commit" 563 564 mark_action_done 565 update_squash_messages$squash_style$sha1 566 author_script_content=$(get_author_ident_from_commit HEAD) 567 echo "$author_script_content" > "$author_script" 568 eval "$author_script_content" 569 if ! pick_one -n$sha1 570 then 571 git rev-parse --verify HEAD >"$amend" 572 die_failed_squash$sha1"$rest" 573 fi 574 case "$(peek_next_command)" in 575 squash|s|fixup|f) 576 # This is an intermediate commit; its message will only be 577 # used in case of trouble. So use the long version: 578 do_with_author output git commit --amend --no-verify -F "$squash_msg" \ 579${gpg_sign_opt:+"$gpg_sign_opt"}|| 580 die_failed_squash$sha1"$rest" 581 ;; 582 *) 583 # This is the final command of this squash/fixup group 584 if test -f "$fixup_msg" 585 then 586 do_with_author git commit --amend --no-verify -F "$fixup_msg" \ 587${gpg_sign_opt:+"$gpg_sign_opt"}|| 588 die_failed_squash$sha1"$rest" 589 else 590 cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit 591 rm -f "$GIT_DIR"/MERGE_MSG 592 do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \ 593${gpg_sign_opt:+"$gpg_sign_opt"}|| 594 die_failed_squash$sha1"$rest" 595 fi 596 rm -f "$squash_msg" "$fixup_msg" 597 ;; 598 esac 599 record_in_rewritten$sha1 600 ;; 601 x|"exec") 602 read -r command rest < "$todo" 603 mark_action_done 604 printf 'Executing: %s\n' "$rest" 605 # "exec" command doesn't take a sha1 in the todo-list. 606# => can't just use $sha1 here. 607 git rev-parse --verify HEAD >"$state_dir"/stopped-sha 608${SHELL:-@SHELL_PATH@}-c"$rest"# Actual execution 609 status=$? 610# Run in subshell because require_clean_work_tree can die. 611 dirty=f 612(require_clean_work_tree "rebase"2>/dev/null) || dirty=t 613iftest"$status"-ne0 614then 615 warn "Execution failed:$rest" 616test"$dirty"= f || 617 warn "and made changes to the index and/or the working tree" 618 619 warn "You can fix the problem, and then run" 620 warn 621 warn " git rebase --continue" 622 warn 623iftest$status-eq127# command not found 624then 625 status=1 626fi 627exit"$status" 628eliftest"$dirty"= t 629then 630 warn "Execution succeeded:$rest" 631 warn "but left changes to the index and/or the working tree" 632 warn "Commit or stash your changes, and then run" 633 warn 634 warn " git rebase --continue" 635 warn 636exit1 637fi 638;; 639*) 640 warn "Unknown command:$command$sha1$rest" 641 fixtodo="Please fix this using 'git rebase --edit-todo'." 642if git rev-parse --verify -q"$sha1">/dev/null 643then 644 die_with_patch $sha1"$fixtodo" 645else 646 die "$fixtodo" 647fi 648;; 649esac 650test -s"$todo"&&return 651 652 comment_for_reflog finish && 653 newhead=$(git rev-parse HEAD)&& 654case$head_namein 655 refs/*) 656 message="$GIT_REFLOG_ACTION:$head_nameonto$onto"&& 657 git update-ref -m"$message"$head_name $newhead $orig_head&& 658 git symbolic-ref \ 659-m"$GIT_REFLOG_ACTION: returning to$head_name" \ 660 HEAD $head_name 661;; 662esac&& { 663test!-f"$state_dir"/verbose || 664 git diff-tree --stat$orig_head..HEAD 665} && 666{ 667test -s"$rewritten_list"&& 668 git notes copy --for-rewrite=rebase <"$rewritten_list"|| 669 true # we don't care if this copying failed 670} && 671 hook="$(git rev-parse --git-path hooks/post-rewrite)" 672iftest -x"$hook"&&test -s"$rewritten_list";then 673"$hook" rebase <"$rewritten_list" 674 true # we don't care if this hook failed 675fi&& 676 warn "Successfully rebased and updated$head_name." 677 678return1# not failure; just to break the do_rest loop 679} 680 681# can only return 0, when the infinite loop breaks 682do_rest () { 683while: 684do 685 do_next ||break 686done 687} 688 689# skip picking commits whose parents are unchanged 690skip_unnecessary_picks () { 691 fd=3 692whileread -r command rest 693do 694# fd=3 means we skip the command 695case"$fd,$command"in 6963,pick|3,p) 697# pick a commit whose parent is current $onto -> skip 698 sha1=${rest%% *} 699case"$(git rev-parse --verify --quiet "$sha1"^)"in 700"$onto"*) 701 onto=$sha1 702;; 703*) 704 fd=1 705;; 706esac 707;; 7083,"$comment_char"*|3,) 709# copy comments 710;; 711*) 712 fd=1 713;; 714esac 715printf'%s\n'"$command${rest:+ }$rest">&$fd 716done<"$todo">"$todo.new"3>>"$done"&& 717mv-f"$todo".new "$todo"&& 718case"$(peek_next_command)"in 719 squash|s|fixup|f) 720 record_in_rewritten "$onto" 721;; 722esac|| 723 die "Could not skip unnecessary pick commands" 724} 725 726transform_todo_ids () { 727whileread -r command rest 728do 729case"$command"in 730"$comment_char"* |exec) 731# Be careful for oddball commands like 'exec' 732# that do not have a SHA-1 at the beginning of $rest. 733;; 734*) 735 sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[ ]*})&& 736 rest="$sha1${rest#*[ ]}" 737;; 738esac 739printf'%s\n'"$command${rest:+ }$rest" 740done<"$todo">"$todo.new"&& 741mv-f"$todo.new""$todo" 742} 743 744expand_todo_ids() { 745 transform_todo_ids 746} 747 748collapse_todo_ids() { 749 transform_todo_ids --short 750} 751 752# Rearrange the todo list that has both "pick sha1 msg" and 753# "pick sha1 fixup!/squash! msg" appears in it so that the latter 754# comes immediately after the former, and change "pick" to 755# "fixup"/"squash". 756rearrange_squash () { 757# extract fixup!/squash! lines and resolve any referenced sha1's 758whileread -r pick sha1 message 759do 760case"$message"in 761"squash! "*|"fixup! "*) 762 action="${message%%!*}" 763 rest=$message 764 prefix= 765# skip all squash! or fixup! (but save for later) 766while: 767do 768case"$rest"in 769"squash! "*|"fixup! "*) 770 prefix="$prefix${rest%%!*}," 771 rest="${rest#*! }" 772;; 773*) 774break 775;; 776esac 777done 778printf'%s %s %s %s\n'"$sha1""$action""$prefix""$rest" 779# if it's a single word, try to resolve to a full sha1 and 780# emit a second copy. This allows us to match on both message 781# and on sha1 prefix 782iftest"${rest#* }"="$rest";then 783 fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)" 784iftest -n"$fullsha";then 785# prefix the action to uniquely identify this line as 786# intended for full sha1 match 787echo"$sha1+$action$prefix$fullsha" 788fi 789fi 790esac 791done>"$1.sq"<"$1" 792test -s"$1.sq"||return 793 794 used= 795whileread -r pick sha1 message 796do 797case"$used"in 798*"$sha1"*)continue;; 799esac 800printf'%s\n'"$pick$sha1$message" 801 used="$used$sha1" 802whileread -r squash action msg_prefix msg_content 803do 804case"$used"in 805*"$squash"*)continue;; 806esac 807 emit=0 808case"$action"in 809+*) 810 action="${action#+}" 811# full sha1 prefix test 812case"$msg_content"in"$sha1"*) emit=1;;esac;; 813*) 814# message prefix test 815case"$message"in"$msg_content"*) emit=1;;esac;; 816esac 817iftest$emit=1;then 818 real_prefix=$(echo "$msg_prefix" | sed "s/,/! /g") 819printf'%s\n'"$action$squash${real_prefix}$msg_content" 820 used="$used$squash" 821fi 822done<"$1.sq" 823done>"$1.rearranged"<"$1" 824cat"$1.rearranged">"$1" 825rm-f"$1.sq""$1.rearranged" 826} 827 828# Add commands after a pick or after a squash/fixup serie 829# in the todo list. 830add_exec_commands () { 831{ 832 first=t 833whileread -r insn rest 834do 835case$insnin 836 pick) 837test -n"$first"|| 838printf"%s""$cmd" 839;; 840esac 841printf"%s %s\n""$insn""$rest" 842 first= 843done 844printf"%s""$cmd" 845} <"$1">"$1.new"&& 846mv"$1.new""$1" 847} 848 849# Check if the SHA-1 passed as an argument is a 850# correct one, if not then print $2 in "$todo".badsha 851# $1: the SHA-1 to test 852# $2: the line number of the input 853# $3: the input filename 854check_commit_sha () { 855 badsha=0 856iftest -z$1 857then 858 badsha=1 859else 860 sha1_verif="$(git rev-parse --verify --quiet $1^{commit})" 861iftest -z$sha1_verif 862then 863 badsha=1 864fi 865fi 866 867iftest$badsha-ne0 868then 869 line="$(sed -n -e "${2}p" "$3")" 870 warn "Warning: the SHA-1 is missing or isn't" \ 871"a commit in the following line:" 872 warn " -$line" 873 warn 874fi 875 876return$badsha 877} 878 879# prints the bad commits and bad commands 880# from the todolist in stdin 881check_bad_cmd_and_sha () { 882 retval=0 883 lineno=0 884whileread -r command rest 885do 886 lineno=$(( $lineno + 1 )) 887case$commandin 888"$comment_char"*|''|noop|x|exec) 889# Doesn't expect a SHA-1 890;; 891 pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f) 892if! check_commit_sha "${rest%%[ ]*}""$lineno""$1" 893then 894 retval=1 895fi 896;; 897*) 898 line="$(sed -n -e "${lineno}p" "$1")" 899 warn "Warning: the command isn't recognized" \ 900"in the following line:" 901 warn " -$line" 902 warn 903 retval=1 904;; 905esac 906done<"$1" 907return$retval 908} 909 910# Print the list of the SHA-1 of the commits 911# from stdin to stdout 912todo_list_to_sha_list () { 913 git stripspace --strip-comments| 914whileread -r command sha1 rest 915do 916case$commandin 917"$comment_char"*|''|noop|x|"exec") 918;; 919*) 920 long_sha=$(git rev-list --no-walk "$sha1" 2>/dev/null) 921printf"%s\n""$long_sha" 922;; 923esac 924done 925} 926 927# Use warn for each line in stdin 928warn_lines () { 929whileread -r line 930do 931 warn " -$line" 932done 933} 934 935# Switch to the branch in $into and notify it in the reflog 936checkout_onto () { 937 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$onto_name" 938 output git checkout $onto|| die_abort "could not detach HEAD" 939 git update-ref ORIG_HEAD $orig_head 940} 941 942get_missing_commit_check_level () { 943 check_level=$(git config --get rebase.missingCommitsCheck) 944 check_level=${check_level:-ignore} 945# Don't be case sensitive 946printf'%s'"$check_level"|tr'A-Z''a-z' 947} 948 949# Check if the user dropped some commits by mistake 950# Behaviour determined by rebase.missingCommitsCheck. 951# Check if there is an unrecognized command or a 952# bad SHA-1 in a command. 953check_todo_list () { 954 raise_error=f 955 956 check_level=$(get_missing_commit_check_level) 957 958case"$check_level"in 959 warn|error) 960# Get the SHA-1 of the commits 961 todo_list_to_sha_list <"$todo".backup >"$todo".oldsha1 962 todo_list_to_sha_list <"$todo">"$todo".newsha1 963 964# Sort the SHA-1 and compare them 965sort-u"$todo".oldsha1 >"$todo".oldsha1+ 966mv"$todo".oldsha1+"$todo".oldsha1 967sort-u"$todo".newsha1 >"$todo".newsha1+ 968mv"$todo".newsha1+"$todo".newsha1 969comm-2 -3"$todo".oldsha1 "$todo".newsha1 >"$todo".miss 970 971# Warn about missing commits 972iftest -s"$todo".miss 973then 974test"$check_level"= error && raise_error=t 975 976 warn "Warning: some commits may have been dropped" \ 977"accidentally." 978 warn "Dropped commits (newer to older):" 979 980# Make the list user-friendly and display 981 opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin" 982 git rev-list$opt<"$todo".miss | warn_lines 983 984 warn "To avoid this message, use\"drop\"to" \ 985"explicitly remove a commit." 986 warn 987 warn "Use 'git config rebase.missingCommitsCheck' to change" \ 988"the level of warnings." 989 warn "The possible behaviours are: ignore, warn, error." 990 warn 991fi 992;; 993 ignore) 994;; 995*) 996 warn "Unrecognized setting$check_levelfor option" \ 997"rebase.missingCommitsCheck. Ignoring." 998;; 999esac10001001if! check_bad_cmd_and_sha "$todo"1002then1003 raise_error=t1004fi10051006iftest$raise_error= t1007then1008# Checkout before the first commit of the1009# rebase: this way git rebase --continue1010# will work correctly as it expects HEAD to be1011# placed before the commit of the next action1012 checkout_onto10131014 warn "You can fix this with 'git rebase --edit-todo'."1015 die "Or you can abort the rebase with 'git rebase --abort'."1016fi1017}10181019# The whole contents of this file is run by dot-sourcing it from1020# inside a shell function. It used to be that "return"s we see1021# below were not inside any function, and expected to return1022# to the function that dot-sourced us.1023#1024# However, FreeBSD /bin/sh misbehaves on such a construct and1025# continues to run the statements that follow such a "return".1026# As a work-around, we introduce an extra layer of a function1027# here, and immediately call it after defining it.1028git_rebase__interactive () {10291030case"$action"in1031continue)1032# do we have anything to commit?1033if git diff-index --cached --quiet HEAD --1034then1035: Nothing to commit -- skip this1036else1037if!test -f"$author_script"1038then1039 gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}1040 die "You have staged changes in your working tree. If these changes are meant to be1041squashed into the previous commit, run:10421043 git commit --amend$gpg_sign_opt_quoted10441045If they are meant to go into a new commit, run:10461047 git commit$gpg_sign_opt_quoted10481049In both case, once you're done, continue with:10501051 git rebase --continue1052"1053fi1054 . "$author_script"||1055 die "Error trying to find the author identity to amend commit"1056iftest -f"$amend"1057then1058 current_head=$(git rev-parse --verify HEAD)1059test"$current_head"=$(cat "$amend")||1060 die "\1061You have uncommitted changes in your working tree. Please, commit them1062first and then run 'git rebase --continue' again."1063 do_with_author git commit --amend --no-verify -F"$msg"-e \1064${gpg_sign_opt:+"$gpg_sign_opt"}||1065 die "Could not commit staged changes."1066else1067 do_with_author git commit --no-verify -F"$msg"-e \1068${gpg_sign_opt:+"$gpg_sign_opt"}||1069 die "Could not commit staged changes."1070fi1071fi10721073 record_in_rewritten "$(cat "$state_dir"/stopped-sha)"10741075 require_clean_work_tree "rebase"1076 do_rest1077return01078;;1079skip)1080 git rerere clear10811082 do_rest1083return01084;;1085edit-todo)1086 git stripspace --strip-comments<"$todo">"$todo".new1087mv-f"$todo".new "$todo"1088 collapse_todo_ids1089 append_todo_help1090 git stripspace --comment-lines>>"$todo"<<\EOF10911092You are editing the todo file of an ongoing interactive rebase.1093To continue rebase after editing, run:1094 git rebase --continue10951096EOF10971098 git_sequence_editor "$todo"||1099 die "Could not execute editor"1100 expand_todo_ids11011102exit1103;;1104esac11051106git var GIT_COMMITTER_IDENT >/dev/null ||1107 die "You need to set your committer info first"11081109comment_for_reflog start11101111iftest!-z"$switch_to"1112then1113 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$switch_to"1114 output git checkout "$switch_to"--||1115 die "Could not checkout$switch_to"11161117 comment_for_reflog start1118fi11191120orig_head=$(git rev-parse --verify HEAD)|| die "No HEAD?"1121mkdir-p"$state_dir"|| die "Could not create temporary$state_dir"11221123: >"$state_dir"/interactive || die "Could not mark as interactive"1124write_basic_state1125iftest t ="$preserve_merges"1126then1127iftest -z"$rebase_root"1128then1129mkdir"$rewritten"&&1130for c in$(git merge-base --all $orig_head $upstream)1131do1132echo$onto>"$rewritten"/$c||1133 die "Could not init rewritten commits"1134done1135else1136mkdir"$rewritten"&&1137echo$onto>"$rewritten"/root ||1138 die "Could not init rewritten commits"1139fi1140# No cherry-pick because our first pass is to determine1141# parents to rewrite and skipping dropped commits would1142# prematurely end our probe1143 merges_option=1144else1145 merges_option="--no-merges --cherry-pick"1146fi11471148shorthead=$(git rev-parse --short $orig_head)1149shortonto=$(git rev-parse --short $onto)1150iftest -z"$rebase_root"1151# this is now equivalent to ! -z "$upstream"1152then1153 shortupstream=$(git rev-parse --short $upstream)1154 revisions=$upstream...$orig_head1155 shortrevisions=$shortupstream..$shorthead1156else1157 revisions=$onto...$orig_head1158 shortrevisions=$shorthead1159fi1160git rev-list$merges_option--pretty=oneline --reverse --left-right --topo-order \1161$revisions ${restrict_revision+^$restrict_revision}| \1162sed-n"s/^>//p"|1163whileread -r sha1 rest1164do11651166iftest -z"$keep_empty"&& is_empty_commit $sha1&& ! is_merge_commit $sha11167then1168 comment_out="$comment_char"1169else1170 comment_out=1171fi11721173iftest t !="$preserve_merges"1174then1175printf'%s\n'"${comment_out}pick$sha1$rest">>"$todo"1176else1177iftest -z"$rebase_root"1178then1179 preserve=t1180for p in$(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)1181do1182iftest -f"$rewritten"/$p1183then1184 preserve=f1185fi1186done1187else1188 preserve=f1189fi1190iftest f ="$preserve"1191then1192touch"$rewritten"/$sha11193printf'%s\n'"${comment_out}pick$sha1$rest">>"$todo"1194fi1195fi1196done11971198# Watch for commits that been dropped by --cherry-pick1199iftest t ="$preserve_merges"1200then1201mkdir"$dropped"1202# Save all non-cherry-picked changes1203 git rev-list$revisions--left-right --cherry-pick| \1204sed-n"s/^>//p">"$state_dir"/not-cherry-picks1205# Now all commits and note which ones are missing in1206# not-cherry-picks and hence being dropped1207 git rev-list$revisions|1208whilereadrev1209do1210iftest -f"$rewritten"/$rev&&test"$(sane_grep "$rev" "$state_dir"/not-cherry-picks)"=""1211then1212# Use -f2 because if rev-list is telling us this commit is1213# not worthwhile, we don't want to track its multiple heads,1214# just the history of its first-parent for others that will1215# be rebasing on top of it1216 git rev-list --parents -1$rev| cut -d' '-s -f2>"$dropped"/$rev1217 sha1=$(git rev-list -1 $rev)1218 sane_grep -v"^[a-z][a-z]*$sha1"<"$todo">"${todo}2";mv"${todo}2""$todo"1219rm"$rewritten"/$rev1220fi1221done1222fi12231224test -s"$todo"||echo noop >>"$todo"1225test -n"$autosquash"&& rearrange_squash "$todo"1226test -n"$cmd"&& add_exec_commands "$todo"12271228todocount=$(git stripspace --strip-comments <"$todo" | wc -l)1229todocount=${todocount##* }12301231cat>>"$todo"<<EOF12321233$comment_charRebase$shortrevisionsonto$shortonto($todocountcommand(s))1234EOF1235append_todo_help1236git stripspace --comment-lines>>"$todo"<<\EOF12371238However,if you remove everything, the rebase will be aborted.12391240EOF12411242iftest -z"$keep_empty"1243then1244printf'%s\n'"$comment_charNote that empty commits are commented out">>"$todo"1245fi124612471248has_action "$todo"||1249return212501251cp"$todo""$todo".backup1252collapse_todo_ids1253git_sequence_editor "$todo"||1254 die_abort "Could not execute editor"12551256has_action "$todo"||1257return212581259check_todo_list12601261expand_todo_ids12621263test -d"$rewritten"||test -n"$force_rebase"|| skip_unnecessary_picks12641265checkout_onto1266do_rest12671268}1269# ... and then we call the whole thing.1270git_rebase__interactive