git.oblomov.eu Git - git/blob - git-legacy-rebase.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Junio C Hamano.
   4 #
   5
   6 SUBDIRECTORY_OK=Yes
   7 OPTIONS_KEEPDASHDASH=
   8 OPTIONS_STUCKLONG=t
   9 OPTIONS_SPEC="\
  10 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
  11 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
  12 git rebase --continue | --abort | --skip | --edit-todo
  13 --
  14  Available options are
  15 v,verbose!         display a diffstat of what changed upstream
  16 q,quiet!           be quiet. implies --no-stat
  17 autostash          automatically stash/stash pop before and after
  18 fork-point         use 'merge-base --fork-point' to refine upstream
  19 onto=!             rebase onto given branch instead of upstream
  20 r,rebase-merges?   try to rebase merges instead of skipping them
  21 p,preserve-merges! try to recreate merges instead of ignoring them
  22 s,strategy=!       use the given merge strategy
  23 X,strategy-option=! pass the argument through to the merge strategy
  24 no-ff!             cherry-pick all commits, even if unchanged
  25 f,force-rebase!    cherry-pick all commits, even if unchanged
  26 m,merge!           use merging strategies to rebase
  27 i,interactive!     let the user edit the list of commits to rebase
  28 x,exec=!           add exec lines after each commit of the editable list
  29 k,keep-empty       preserve empty commits during rebase
  30 allow-empty-message allow rebasing commits with empty messages
  31 stat!              display a diffstat of what changed upstream
  32 n,no-stat!         do not show diffstat of what changed upstream
  33 verify             allow pre-rebase hook to run
  34 rerere-autoupdate  allow rerere to update index with resolved conflicts
  35 root!              rebase all reachable commits up to the root(s)
  36 autosquash         move commits that begin with squash!/fixup! under -i
  37 signoff            add a Signed-off-by: line to each commit
  38 committer-date-is-author-date! passed to 'git am'
  39 ignore-date!       passed to 'git am'
  40 whitespace=!       passed to 'git apply'
  41 ignore-whitespace! passed to 'git apply'
  42 C=!                passed to 'git apply'
  43 S,gpg-sign?        GPG-sign commits
  44  Actions:
  45 continue!          continue
  46 abort!             abort and check out the original branch
  47 skip!              skip current patch and continue
  48 edit-todo!         edit the todo list during an interactive rebase
  49 quit!              abort but keep HEAD where it is
  50 show-current-patch! show the patch file being applied or merged
  51 "
  52 . git-sh-setup
  53 set_reflog_action rebase
  54 require_work_tree_exists
  55 cd_to_toplevel
  56
  57 LF='
  58 '
  59 ok_to_skip_pre_rebase=
  60
  61 squash_onto=
  62 unset onto
  63 unset restrict_revision
  64 cmd=
  65 strategy=
  66 strategy_opts=
  67 do_merge=
  68 merge_dir="$GIT_DIR"/rebase-merge
  69 apply_dir="$GIT_DIR"/rebase-apply
  70 verbose=
  71 diffstat=
  72 test "$(git config --bool rebase.stat)" = true && diffstat=t
  73 autostash="$(git config --bool rebase.autostash || echo false)"
  74 fork_point=auto
  75 git_am_opt=
  76 git_format_patch_opt=
  77 rebase_root=
  78 force_rebase=
  79 allow_rerere_autoupdate=
  80 # Non-empty if a rebase was in progress when 'git rebase' was invoked
  81 in_progress=
  82 # One of {am, merge, interactive}
  83 type=
  84 # One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge}
  85 state_dir=
  86 # One of {'', continue, skip, abort}, as parsed from command line
  87 action=
  88 rebase_merges=
  89 rebase_cousins=
  90 preserve_merges=
  91 autosquash=
  92 keep_empty=
  93 allow_empty_message=--allow-empty-message
  94 signoff=
  95 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
  96 case "$(git config --bool commit.gpgsign)" in
  97 true)   gpg_sign_opt=-S ;;
  98 *)      gpg_sign_opt= ;;
  99 esac
 100 . git-rebase--common
 101
 102 read_basic_state () {
 103         test -f "$state_dir/head-name" &&
 104         test -f "$state_dir/onto" &&
 105         head_name=$(cat "$state_dir"/head-name) &&
 106         onto=$(cat "$state_dir"/onto) &&
 107         # We always write to orig-head, but interactive rebase used to write to
 108         # head. Fall back to reading from head to cover for the case that the
 109         # user upgraded git with an ongoing interactive rebase.
 110         if test -f "$state_dir"/orig-head
 111         then
 112                 orig_head=$(cat "$state_dir"/orig-head)
 113         else
 114                 orig_head=$(cat "$state_dir"/head)
 115         fi &&
 116         test -f "$state_dir"/quiet && GIT_QUIET=t
 117         test -f "$state_dir"/verbose && verbose=t
 118         test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
 119         test -f "$state_dir"/strategy_opts &&
 120                 strategy_opts="$(cat "$state_dir"/strategy_opts)"
 121         test -f "$state_dir"/allow_rerere_autoupdate &&
 122                 allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)"
 123         test -f "$state_dir"/gpg_sign_opt &&
 124                 gpg_sign_opt="$(cat "$state_dir"/gpg_sign_opt)"
 125         test -f "$state_dir"/signoff && {
 126                 signoff="$(cat "$state_dir"/signoff)"
 127                 force_rebase=t
 128         }
 129 }
 130
 131 finish_rebase () {
 132         rm -f "$(git rev-parse --git-path REBASE_HEAD)"
 133         apply_autostash &&
 134         { git gc --auto || true; } &&
 135         rm -rf "$state_dir"
 136 }
 137
 138 run_interactive () {
 139         GIT_CHERRY_PICK_HELP="$resolvemsg"
 140         export GIT_CHERRY_PICK_HELP
 141
 142         test -n "$keep_empty" && keep_empty="--keep-empty"
 143         test -n "$rebase_merges" && rebase_merges="--rebase-merges"
 144         test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins"
 145         test -n "$autosquash" && autosquash="--autosquash"
 146         test -n "$verbose" && verbose="--verbose"
 147         test -n "$force_rebase" && force_rebase="--no-ff"
 148         test -n "$restrict_revision" && \
 149                 restrict_revision="--restrict-revision=^$restrict_revision"
 150         test -n "$upstream" && upstream="--upstream=$upstream"
 151         test -n "$onto" && onto="--onto=$onto"
 152         test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto"
 153         test -n "$onto_name" && onto_name="--onto-name=$onto_name"
 154         test -n "$head_name" && head_name="--head-name=$head_name"
 155         test -n "$strategy" && strategy="--strategy=$strategy"
 156         test -n "$strategy_opts" && strategy_opts="--strategy-opts=$strategy_opts"
 157         test -n "$switch_to" && switch_to="--switch-to=$switch_to"
 158         test -n "$cmd" && cmd="--cmd=$cmd"
 159         test -n "$action" && action="--$action"
 160
 161         exec git rebase--interactive "$action" "$keep_empty" "$rebase_merges" "$rebase_cousins" \
 162                 "$upstream" "$onto" "$squash_onto" "$restrict_revision" \
 163                 "$allow_empty_message" "$autosquash" "$verbose" \
 164                 "$force_rebase" "$onto_name" "$head_name" "$strategy" \
 165                 "$strategy_opts" "$cmd" "$switch_to" \
 166                 "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff"
 167 }
 168
 169 run_specific_rebase () {
 170         if [ "$interactive_rebase" = implied ]; then
 171                 GIT_EDITOR=:
 172                 export GIT_EDITOR
 173                 autosquash=
 174         fi
 175
 176         if test -n "$interactive_rebase" -a -z "$preserve_merges"
 177         then
 178                 run_interactive
 179         else
 180                 . git-rebase--$type
 181
 182                 if test -z "$preserve_merges"
 183                 then
 184                         git_rebase__$type
 185                 else
 186                         git_rebase__preserve_merges
 187                 fi
 188         fi
 189
 190         ret=$?
 191         if test $ret -eq 0
 192         then
 193                 finish_rebase
 194         elif test $ret -eq 2 # special exit status for rebase -p
 195         then
 196                 apply_autostash &&
 197                 rm -rf "$state_dir" &&
 198                 die "Nothing to do"
 199         fi
 200         exit $ret
 201 }
 202
 203 run_pre_rebase_hook () {
 204         if test -z "$ok_to_skip_pre_rebase" &&
 205            test -x "$(git rev-parse --git-path hooks/pre-rebase)"
 206         then
 207                 "$(git rev-parse --git-path hooks/pre-rebase)" ${1+"$@"} ||
 208                 die "$(gettext "The pre-rebase hook refused to rebase.")"
 209         fi
 210 }
 211
 212 test -f "$apply_dir"/applying &&
 213         die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
 214
 215 if test -d "$apply_dir"
 216 then
 217         type=am
 218         state_dir="$apply_dir"
 219 elif test -d "$merge_dir"
 220 then
 221         type=interactive
 222         if test -d "$merge_dir"/rewritten
 223         then
 224                 type=preserve-merges
 225                 interactive_rebase=explicit
 226                 preserve_merges=t
 227         elif test -f "$merge_dir"/interactive
 228         then
 229                 interactive_rebase=explicit
 230         fi
 231         state_dir="$merge_dir"
 232 fi
 233 test -n "$type" && in_progress=t
 234
 235 total_argc=$#
 236 while test $# != 0
 237 do
 238         case "$1" in
 239         --no-verify)
 240                 ok_to_skip_pre_rebase=yes
 241                 ;;
 242         --verify)
 243                 ok_to_skip_pre_rebase=
 244                 ;;
 245         --continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
 246                 test $total_argc -eq 2 || usage
 247                 action=${1##--}
 248                 ;;
 249         --onto=*)
 250                 onto="${1#--onto=}"
 251                 ;;
 252         --exec=*)
 253                 cmd="${cmd}exec ${1#--exec=}${LF}"
 254                 test -z "$interactive_rebase" && interactive_rebase=implied
 255                 ;;
 256         --interactive)
 257                 interactive_rebase=explicit
 258                 ;;
 259         --keep-empty)
 260                 keep_empty=yes
 261                 ;;
 262         --allow-empty-message)
 263                 allow_empty_message=--allow-empty-message
 264                 ;;
 265         --no-keep-empty)
 266                 keep_empty=
 267                 ;;
 268         --rebase-merges)
 269                 rebase_merges=t
 270                 test -z "$interactive_rebase" && interactive_rebase=implied
 271                 ;;
 272         --rebase-merges=*)
 273                 rebase_merges=t
 274                 case "${1#*=}" in
 275                 rebase-cousins) rebase_cousins=t;;
 276                 no-rebase-cousins) rebase_cousins=;;
 277                 *) die "Unknown mode: $1";;
 278                 esac
 279                 test -z "$interactive_rebase" && interactive_rebase=implied
 280                 ;;
 281         --preserve-merges)
 282                 preserve_merges=t
 283                 test -z "$interactive_rebase" && interactive_rebase=implied
 284                 ;;
 285         --autosquash)
 286                 autosquash=t
 287                 ;;
 288         --no-autosquash)
 289                 autosquash=
 290                 ;;
 291         --fork-point)
 292                 fork_point=t
 293                 ;;
 294         --no-fork-point)
 295                 fork_point=
 296                 ;;
 297         --merge)
 298                 do_merge=t
 299                 ;;
 300         --strategy-option=*)
 301                 strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)"
 302                 do_merge=t
 303                 test -z "$strategy" && strategy=recursive
 304                 ;;
 305         --strategy=*)
 306                 strategy="${1#--strategy=}"
 307                 do_merge=t
 308                 ;;
 309         --no-stat)
 310                 diffstat=
 311                 ;;
 312         --stat)
 313                 diffstat=t
 314                 ;;
 315         --autostash)
 316                 autostash=true
 317                 ;;
 318         --no-autostash)
 319                 autostash=false
 320                 ;;
 321         --verbose)
 322                 verbose=t
 323                 diffstat=t
 324                 GIT_QUIET=
 325                 ;;
 326         --quiet)
 327                 GIT_QUIET=t
 328                 git_am_opt="$git_am_opt -q"
 329                 verbose=
 330                 diffstat=
 331                 ;;
 332         --whitespace=*)
 333                 git_am_opt="$git_am_opt --whitespace=${1#--whitespace=}"
 334                 case "${1#--whitespace=}" in
 335                 fix|strip)
 336                         force_rebase=t
 337                         ;;
 338                 warn|nowarn|error|error-all)
 339                         ;; # okay, known whitespace option
 340                 *)
 341                         die "fatal: Invalid whitespace option: '${1#*=}'"
 342                         ;;
 343                 esac
 344                 ;;
 345         --ignore-whitespace)
 346                 git_am_opt="$git_am_opt $1"
 347                 ;;
 348         --signoff)
 349                 signoff=--signoff
 350                 ;;
 351         --no-signoff)
 352                 signoff=
 353                 ;;
 354         --committer-date-is-author-date|--ignore-date)
 355                 git_am_opt="$git_am_opt $1"
 356                 force_rebase=t
 357                 ;;
 358         -C*[!0-9]*)
 359                 die "fatal: switch \`C' expects a numerical value"
 360                 ;;
 361         -C*)
 362                 git_am_opt="$git_am_opt $1"
 363                 ;;
 364         --root)
 365                 rebase_root=t
 366                 ;;
 367         --force-rebase|--no-ff)
 368                 force_rebase=t
 369                 ;;
 370         --rerere-autoupdate|--no-rerere-autoupdate)
 371                 allow_rerere_autoupdate="$1"
 372                 ;;
 373         --gpg-sign)
 374                 gpg_sign_opt=-S
 375                 ;;
 376         --gpg-sign=*)
 377                 gpg_sign_opt="-S${1#--gpg-sign=}"
 378                 ;;
 379         --)
 380                 shift
 381                 break
 382                 ;;
 383         *)
 384                 usage
 385                 ;;
 386         esac
 387         shift
 388 done
 389 test $# -gt 2 && usage
 390
 391 if test -n "$action"
 392 then
 393         test -z "$in_progress" && die "$(gettext "No rebase in progress?")"
 394         # Only interactive rebase uses detailed reflog messages
 395         if test -n "$interactive_rebase" && test "$GIT_REFLOG_ACTION" = rebase
 396         then
 397                 GIT_REFLOG_ACTION="rebase -i ($action)"
 398                 export GIT_REFLOG_ACTION
 399         fi
 400 fi
 401
 402 if test "$action" = "edit-todo" && test -z "$interactive_rebase"
 403 then
 404         die "$(gettext "The --edit-todo action can only be used during interactive rebase.")"
 405 fi
 406
 407 case "$action" in
 408 continue)
 409         # Sanity check
 410         git rev-parse --verify HEAD >/dev/null ||
 411                 die "$(gettext "Cannot read HEAD")"
 412         git update-index --ignore-submodules --refresh &&
 413         git diff-files --quiet --ignore-submodules || {
 414                 echo "$(gettext "You must edit all merge conflicts and then
 415 mark them as resolved using git add")"
 416                 exit 1
 417         }
 418         read_basic_state
 419         run_specific_rebase
 420         ;;
 421 skip)
 422         output git reset --hard HEAD || exit $?
 423         read_basic_state
 424         run_specific_rebase
 425         ;;
 426 abort)
 427         git rerere clear
 428         read_basic_state
 429         case "$head_name" in
 430         refs/*)
 431                 git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
 432                 die "$(eval_gettext "Could not move back to \$head_name")"
 433                 ;;
 434         esac
 435         output git reset --hard $orig_head
 436         finish_rebase
 437         exit
 438         ;;
 439 quit)
 440         exec rm -rf "$state_dir"
 441         ;;
 442 edit-todo)
 443         run_specific_rebase
 444         ;;
 445 show-current-patch)
 446         run_specific_rebase
 447         die "BUG: run_specific_rebase is not supposed to return here"
 448         ;;
 449 esac
 450
 451 # Make sure no rebase is in progress
 452 if test -n "$in_progress"
 453 then
 454         state_dir_base=${state_dir##*/}
 455         cmd_live_rebase="git rebase (--continue | --abort | --skip)"
 456         cmd_clear_stale_rebase="rm -fr \"$state_dir\""
 457         die "
 458 $(eval_gettext 'It seems that there is already a $state_dir_base directory, and
 459 I wonder if you are in the middle of another rebase.  If that is the
 460 case, please try
 461         $cmd_live_rebase
 462 If that is not the case, please
 463         $cmd_clear_stale_rebase
 464 and run me again.  I am stopping in case you still have something
 465 valuable there.')"
 466 fi
 467
 468 if test -n "$rebase_root" && test -z "$onto"
 469 then
 470         test -z "$interactive_rebase" && interactive_rebase=implied
 471 fi
 472
 473 if test -n "$keep_empty"
 474 then
 475         test -z "$interactive_rebase" && interactive_rebase=implied
 476 fi
 477
 478 actually_interactive=
 479 if test -n "$interactive_rebase"
 480 then
 481         if test -z "$preserve_merges"
 482         then
 483                 type=interactive
 484         else
 485                 type=preserve-merges
 486         fi
 487         actually_interactive=t
 488         state_dir="$merge_dir"
 489 elif test -n "$do_merge"
 490 then
 491         interactive_rebase=implied
 492         type=interactive
 493         state_dir="$merge_dir"
 494 else
 495         type=am
 496         state_dir="$apply_dir"
 497 fi
 498
 499 if test -t 2 && test -z "$GIT_QUIET"
 500 then
 501         git_format_patch_opt="$git_format_patch_opt --progress"
 502 fi
 503
 504 incompatible_opts=$(echo " $git_am_opt " | \
 505                     sed -e 's/ -q / /g' -e 's/^ \(.*\) $/\1/')
 506 if test -n "$incompatible_opts"
 507 then
 508         if test -n "$actually_interactive" || test "$do_merge"
 509         then
 510                 die "$(gettext "fatal: cannot combine am options with either interactive or merge options")"
 511         fi
 512 fi
 513
 514 if test -n "$signoff"
 515 then
 516         test -n "$preserve_merges" &&
 517                 die "$(gettext "fatal: cannot combine '--signoff' with '--preserve-merges'")"
 518         git_am_opt="$git_am_opt $signoff"
 519         force_rebase=t
 520 fi
 521
 522 if test -n "$preserve_merges"
 523 then
 524         # Note: incompatibility with --signoff handled in signoff block above
 525         # Note: incompatibility with --interactive is just a strong warning;
 526         #       git-rebase.txt caveats with "unless you know what you are doing"
 527         test -n "$rebase_merges" &&
 528                 die "$(gettext "fatal: cannot combine '--preserve-merges' with '--rebase-merges'")"
 529 fi
 530
 531 if test -n "$rebase_merges"
 532 then
 533         test -n "$strategy_opts" &&
 534                 die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy-option'")"
 535         test -n "$strategy" &&
 536                 die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy'")"
 537 fi
 538
 539 if test -z "$rebase_root"
 540 then
 541         case "$#" in
 542         0)
 543                 if ! upstream_name=$(git rev-parse --symbolic-full-name \
 544                         --verify -q @{upstream} 2>/dev/null)
 545                 then
 546                         . git-parse-remote
 547                         error_on_missing_default_upstream "rebase" "rebase" \
 548                                 "against" "git rebase $(gettext '<branch>')"
 549                 fi
 550
 551                 test "$fork_point" = auto && fork_point=t
 552                 ;;
 553         *)      upstream_name="$1"
 554                 if test "$upstream_name" = "-"
 555                 then
 556                         upstream_name="@{-1}"
 557                 fi
 558                 shift
 559                 ;;
 560         esac
 561         upstream=$(peel_committish "${upstream_name}") ||
 562         die "$(eval_gettext "invalid upstream '\$upstream_name'")"
 563         upstream_arg="$upstream_name"
 564 else
 565         if test -z "$onto"
 566         then
 567                 empty_tree=$(git hash-object -t tree /dev/null)
 568                 onto=$(git commit-tree $empty_tree </dev/null)
 569                 squash_onto="$onto"
 570         fi
 571         unset upstream_name
 572         unset upstream
 573         test $# -gt 1 && usage
 574         upstream_arg=--root
 575 fi
 576
 577 # Make sure the branch to rebase onto is valid.
 578 onto_name=${onto-"$upstream_name"}
 579 case "$onto_name" in
 580 *...*)
 581         if      left=${onto_name%...*} right=${onto_name#*...} &&
 582                 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
 583         then
 584                 case "$onto" in
 585                 ?*"$LF"?*)
 586                         die "$(eval_gettext "\$onto_name: there are more than one merge bases")"
 587                         ;;
 588                 '')
 589                         die "$(eval_gettext "\$onto_name: there is no merge base")"
 590                         ;;
 591                 esac
 592         else
 593                 die "$(eval_gettext "\$onto_name: there is no merge base")"
 594         fi
 595         ;;
 596 *)
 597         onto=$(peel_committish "$onto_name") ||
 598         die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"
 599         ;;
 600 esac
 601
 602 # If the branch to rebase is given, that is the branch we will rebase
 603 # $branch_name -- branch/commit being rebased, or HEAD (already detached)
 604 # $orig_head -- commit object name of tip of the branch before rebasing
 605 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
 606 switch_to=
 607 case "$#" in
 608 1)
 609         # Is it "rebase other $branchname" or "rebase other $commit"?
 610         branch_name="$1"
 611         switch_to="$1"
 612
 613         # Is it a local branch?
 614         if git show-ref --verify --quiet -- "refs/heads/$branch_name" &&
 615            orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name")
 616         then
 617                 head_name="refs/heads/$branch_name"
 618         # If not is it a valid ref (branch or commit)?
 619         elif orig_head=$(git rev-parse -q --verify "$branch_name")
 620         then
 621                 head_name="detached HEAD"
 622
 623         else
 624                 die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")"
 625         fi
 626         ;;
 627 0)
 628         # Do not need to switch branches, we are already on it.
 629         if branch_name=$(git symbolic-ref -q HEAD)
 630         then
 631                 head_name=$branch_name
 632                 branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)')
 633         else
 634                 head_name="detached HEAD"
 635                 branch_name=HEAD
 636         fi
 637         orig_head=$(git rev-parse --verify HEAD) || exit
 638         ;;
 639 *)
 640         die "BUG: unexpected number of arguments left to parse"
 641         ;;
 642 esac
 643
 644 if test "$fork_point" = t
 645 then
 646         new_upstream=$(git merge-base --fork-point "$upstream_name" \
 647                         "${switch_to:-HEAD}")
 648         if test -n "$new_upstream"
 649         then
 650                 restrict_revision=$new_upstream
 651         fi
 652 fi
 653
 654 if test "$autostash" = true && ! (require_clean_work_tree) 2>/dev/null
 655 then
 656         stash_sha1=$(git stash create "autostash") ||
 657         die "$(gettext 'Cannot autostash')"
 658
 659         mkdir -p "$state_dir" &&
 660         echo $stash_sha1 >"$state_dir/autostash" &&
 661         stash_abbrev=$(git rev-parse --short $stash_sha1) &&
 662         echo "$(eval_gettext 'Created autostash: $stash_abbrev')" &&
 663         git reset --hard
 664 fi
 665
 666 require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")"
 667
 668 # Now we are rebasing commits $upstream..$orig_head (or with --root,
 669 # everything leading up to $orig_head) on top of $onto
 670
 671 # Check if we are already based on $onto with linear history,
 672 # but this should be done only when upstream and onto are the same
 673 # and if this is not an interactive rebase.
 674 mb=$(git merge-base "$onto" "$orig_head")
 675 if test -z "$actually_interactive" && test "$upstream" = "$onto" &&
 676         test "$mb" = "$onto" && test -z "$restrict_revision" &&
 677         # linear history?
 678         ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null
 679 then
 680         if test -z "$force_rebase"
 681         then
 682                 # Lazily switch to the target branch if needed...
 683                 test -z "$switch_to" ||
 684                 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
 685                         git checkout -q "$switch_to" --
 686                 if test "$branch_name" = "HEAD" &&
 687                          ! git symbolic-ref -q HEAD
 688                 then
 689                         say "$(eval_gettext "HEAD is up to date.")"
 690                 else
 691                         say "$(eval_gettext "Current branch \$branch_name is up to date.")"
 692                 fi
 693                 finish_rebase
 694                 exit 0
 695         else
 696                 if test "$branch_name" = "HEAD" &&
 697                          ! git symbolic-ref -q HEAD
 698                 then
 699                         say "$(eval_gettext "HEAD is up to date, rebase forced.")"
 700                 else
 701                         say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
 702                 fi
 703         fi
 704 fi
 705
 706 # If a hook exists, give it a chance to interrupt
 707 run_pre_rebase_hook "$upstream_arg" "$@"
 708
 709 if test -n "$diffstat"
 710 then
 711         if test -n "$verbose"
 712         then
 713                 if test -z "$mb"
 714                 then
 715                         echo "$(eval_gettext "Changes to \$onto:")"
 716                 else
 717                         echo "$(eval_gettext "Changes from \$mb to \$onto:")"
 718                 fi
 719         fi
 720         mb_tree="${mb:-$(git hash-object -t tree /dev/null)}"
 721         # We want color (if set), but no pager
 722         GIT_PAGER='' git diff --stat --summary "$mb_tree" "$onto"
 723 fi
 724
 725 if test -z "$actually_interactive" && test "$mb" = "$orig_head"
 726 then
 727         say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"
 728         GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
 729                 git checkout -q "$onto^0" || die "could not detach HEAD"
 730         # If the $onto is a proper descendant of the tip of the branch, then
 731         # we just fast-forwarded.
 732         git update-ref ORIG_HEAD $orig_head
 733         move_to_original_branch
 734         finish_rebase
 735         exit 0
 736 fi
 737
 738 test -n "$interactive_rebase" && run_specific_rebase
 739
 740 # Detach HEAD and reset the tree
 741 say "$(gettext "First, rewinding head to replay your work on top of it...")"
 742
 743 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
 744         git checkout -q "$onto^0" || die "could not detach HEAD"
 745 git update-ref ORIG_HEAD $orig_head
 746
 747 if test -n "$rebase_root"
 748 then
 749         revisions="$onto..$orig_head"
 750 else
 751         revisions="${restrict_revision-$upstream}..$orig_head"
 752 fi
 753
 754 run_specific_rebase