git-rebase.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Junio C Hamano.
   4 #
   5
   6 USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] (<upstream>|--root) [<branch>] [--quiet | -q]'
   7 LONG_USAGE='git-rebase replaces <branch> with a new branch of the
   8 same name.  When the --onto option is provided the new branch starts
   9 out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
  10 It then attempts to create a new commit for each commit from the original
  11 <branch> that does not exist in the <upstream> branch.
  12
  13 It is possible that a merge failure will prevent this process from being
  14 completely automatic.  You will have to resolve any such merge failure
  15 and run git rebase --continue.  Another option is to bypass the commit
  16 that caused the merge failure with git rebase --skip.  To restore the
  17 original <branch> and remove the .git/rebase-apply working files, use the
  18 command git rebase --abort instead.
  19
  20 Note that if <branch> is not specified on the command line, the
  21 currently checked out branch is used.
  22
  23 Example:       git-rebase master~1 topic
  24
  25         A---B---C topic                   A'\''--B'\''--C'\'' topic
  26        /                   -->           /
  27   D---E---F---G master          D---E---F---G master
  28 '
  29
  30 SUBDIRECTORY_OK=Yes
  31 OPTIONS_SPEC=
  32 . git-sh-setup
  33 set_reflog_action rebase
  34 require_work_tree
  35 cd_to_toplevel
  36
  37 LF='
  38 '
  39 OK_TO_SKIP_PRE_REBASE=
  40 RESOLVEMSG="
  41 When you have resolved this problem run \"git rebase --continue\".
  42 If you would prefer to skip this patch, instead run \"git rebase --skip\".
  43 To restore the original branch and stop rebasing run \"git rebase --abort\".
  44 "
  45 unset newbase
  46 strategy=recursive
  47 do_merge=
  48 dotest="$GIT_DIR"/rebase-merge
  49 prec=4
  50 verbose=
  51 diffstat=$(git config --bool rebase.stat)
  52 git_am_opt=
  53 rebase_root=
  54 force_rebase=
  55 allow_rerere_autoupdate=
  56 add_commit_name=
  57
  58 continue_merge () {
  59         test -n "$prev_head" || die "prev_head must be defined"
  60         test -d "$dotest" || die "$dotest directory does not exist"
  61
  62         unmerged=$(git ls-files -u)
  63         if test -n "$unmerged"
  64         then
  65                 echo "You still have unmerged paths in your index"
  66                 echo "did you forget to use git add?"
  67                 die "$RESOLVEMSG"
  68         fi
  69
  70         cmt=`cat "$dotest/current"`
  71         if ! git diff-index --quiet --ignore-submodules HEAD --
  72         then
  73                 if ! git commit --no-verify -C "$cmt"
  74                 then
  75                         echo "Commit failed, please do not call \"git commit\""
  76                         echo "directly, but instead do one of the following: "
  77                         die "$RESOLVEMSG"
  78                 fi
  79                 if test -z "$GIT_QUIET"
  80                 then
  81                         printf "Committed: %0${prec}d " $msgnum
  82                 fi
  83                 echo "$cmt $(git rev-parse HEAD^0)" >> "$dotest/rewritten"
  84         else
  85                 if test -z "$GIT_QUIET"
  86                 then
  87                         printf "Already applied: %0${prec}d " $msgnum
  88                 fi
  89         fi
  90         test -z "$GIT_QUIET" &&
  91         GIT_PAGER='' git log --format=%s -1 "$cmt"
  92
  93         prev_head=`git rev-parse HEAD^0`
  94         # save the resulting commit so we can read-tree on it later
  95         echo "$prev_head" > "$dotest/prev_head"
  96
  97         # onto the next patch:
  98         msgnum=$(($msgnum + 1))
  99         echo "$msgnum" >"$dotest/msgnum"
 100 }
 101
 102 call_merge () {
 103         cmt="$(cat "$dotest/cmt.$1")"
 104         echo "$cmt" > "$dotest/current"
 105         hd=$(git rev-parse --verify HEAD)
 106         cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
 107         msgnum=$(cat "$dotest/msgnum")
 108         end=$(cat "$dotest/end")
 109         eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
 110         eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
 111         export GITHEAD_$cmt GITHEAD_$hd
 112         if test -n "$GIT_QUIET"
 113         then
 114                 export GIT_MERGE_VERBOSITY=1
 115         fi
 116         git-merge-$strategy "$cmt^" -- "$hd" "$cmt"
 117         rv=$?
 118         case "$rv" in
 119         0)
 120                 unset GITHEAD_$cmt GITHEAD_$hd
 121                 return
 122                 ;;
 123         1)
 124                 git rerere $allow_rerere_autoupdate
 125                 die "$RESOLVEMSG"
 126                 ;;
 127         2)
 128                 echo "Strategy: $rv $strategy failed, try another" 1>&2
 129                 die "$RESOLVEMSG"
 130                 ;;
 131         *)
 132                 die "Unknown exit code ($rv) from command:" \
 133                         "git-merge-$strategy $cmt^ -- HEAD $cmt"
 134                 ;;
 135         esac
 136 }
 137
 138 move_to_original_branch () {
 139         test -z "$head_name" &&
 140                 head_name="$(cat "$dotest"/head-name)" &&
 141                 onto="$(cat "$dotest"/onto)" &&
 142                 orig_head="$(cat "$dotest"/orig-head)"
 143         case "$head_name" in
 144         refs/*)
 145                 message="rebase finished: $head_name onto $onto"
 146                 git update-ref -m "$message" \
 147                         $head_name $(git rev-parse HEAD) $orig_head &&
 148                 git symbolic-ref HEAD $head_name ||
 149                 die "Could not move back to $head_name"
 150                 ;;
 151         esac
 152 }
 153
 154 finish_rb_merge () {
 155         move_to_original_branch
 156         git notes copy --for-rewrite=rebase < "$dotest"/rewritten
 157         if test -x "$GIT_DIR"/hooks/post-rewrite &&
 158                 test -s "$dotest"/rewritten; then
 159                 "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
 160         fi
 161         rm -r "$dotest"
 162         say All done.
 163 }
 164
 165 is_interactive () {
 166         while test $# != 0
 167         do
 168                 case "$1" in
 169                         -i|--interactive)
 170                                 interactive_rebase=explicit
 171                                 break
 172                         ;;
 173                         -p|--preserve-merges)
 174                                 interactive_rebase=implied
 175                         ;;
 176                 esac
 177                 shift
 178         done
 179
 180         if [ "$interactive_rebase" = implied ]; then
 181                 GIT_EDITOR=:
 182                 export GIT_EDITOR
 183         fi
 184
 185         test -n "$interactive_rebase" || test -f "$dotest"/interactive
 186 }
 187
 188 run_pre_rebase_hook () {
 189         if test -z "$OK_TO_SKIP_PRE_REBASE" &&
 190            test -x "$GIT_DIR/hooks/pre-rebase"
 191         then
 192                 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
 193                 die "The pre-rebase hook refused to rebase."
 194         fi
 195 }
 196
 197 test -f "$GIT_DIR"/rebase-apply/applying &&
 198         die 'It looks like git-am is in progress. Cannot rebase.'
 199
 200 is_interactive "$@" && exec git-rebase--interactive "$@"
 201
 202 while test $# != 0
 203 do
 204         case "$1" in
 205         --no-verify)
 206                 OK_TO_SKIP_PRE_REBASE=yes
 207                 ;;
 208         --continue)
 209                 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
 210                         die "No rebase in progress?"
 211
 212                 git diff-files --quiet --ignore-submodules || {
 213                         echo "You must edit all merge conflicts and then"
 214                         echo "mark them as resolved using git add"
 215                         exit 1
 216                 }
 217                 if test -d "$dotest"
 218                 then
 219                         prev_head=$(cat "$dotest/prev_head")
 220                         end=$(cat "$dotest/end")
 221                         msgnum=$(cat "$dotest/msgnum")
 222                         onto=$(cat "$dotest/onto")
 223                         GIT_QUIET=$(cat "$dotest/quiet")
 224                         continue_merge
 225                         while test "$msgnum" -le "$end"
 226                         do
 227                                 call_merge "$msgnum"
 228                                 continue_merge
 229                         done
 230                         finish_rb_merge
 231                         exit
 232                 fi
 233                 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
 234                 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
 235                 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
 236                 GIT_QUIET=$(cat "$GIT_DIR"/rebase-apply/quiet)
 237                 git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
 238                 move_to_original_branch
 239                 exit
 240                 ;;
 241         --skip)
 242                 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
 243                         die "No rebase in progress?"
 244
 245                 git reset --hard HEAD || exit $?
 246                 if test -d "$dotest"
 247                 then
 248                         git rerere clear
 249                         prev_head=$(cat "$dotest/prev_head")
 250                         end=$(cat "$dotest/end")
 251                         msgnum=$(cat "$dotest/msgnum")
 252                         msgnum=$(($msgnum + 1))
 253                         onto=$(cat "$dotest/onto")
 254                         GIT_QUIET=$(cat "$dotest/quiet")
 255                         while test "$msgnum" -le "$end"
 256                         do
 257                                 call_merge "$msgnum"
 258                                 continue_merge
 259                         done
 260                         finish_rb_merge
 261                         exit
 262                 fi
 263                 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
 264                 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
 265                 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
 266                 GIT_QUIET=$(cat "$GIT_DIR"/rebase-apply/quiet)
 267                 git am -3 --skip --resolvemsg="$RESOLVEMSG" &&
 268                 move_to_original_branch
 269                 exit
 270                 ;;
 271         --abort)
 272                 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
 273                         die "No rebase in progress?"
 274
 275                 git rerere clear
 276                 if test -d "$dotest"
 277                 then
 278                         GIT_QUIET=$(cat "$dotest/quiet")
 279                         move_to_original_branch
 280                 else
 281                         dotest="$GIT_DIR"/rebase-apply
 282                         GIT_QUIET=$(cat "$dotest/quiet")
 283                         move_to_original_branch
 284                 fi
 285                 git reset --hard $(cat "$dotest/orig-head")
 286                 rm -r "$dotest"
 287                 exit
 288                 ;;
 289         --onto)
 290                 test 2 -le "$#" || usage
 291                 newbase="$2"
 292                 shift
 293                 ;;
 294         -M|-m|--m|--me|--mer|--merg|--merge)
 295                 do_merge=t
 296                 ;;
 297         -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
 298                 --strateg=*|--strategy=*|\
 299         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
 300                 case "$#,$1" in
 301                 *,*=*)
 302                         strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
 303                 1,*)
 304                         usage ;;
 305                 *)
 306                         strategy="$2"
 307                         shift ;;
 308                 esac
 309                 do_merge=t
 310                 ;;
 311         -n|--no-stat)
 312                 diffstat=
 313                 ;;
 314         --stat)
 315                 diffstat=t
 316                 ;;
 317         -v|--verbose)
 318                 verbose=t
 319                 diffstat=t
 320                 GIT_QUIET=
 321                 ;;
 322         -q|--quiet)
 323                 GIT_QUIET=t
 324                 git_am_opt="$git_am_opt -q"
 325                 verbose=
 326                 diffstat=
 327                 ;;
 328         --whitespace=*)
 329                 git_am_opt="$git_am_opt $1"
 330                 case "$1" in
 331                 --whitespace=fix|--whitespace=strip)
 332                         force_rebase=t
 333                         ;;
 334                 esac
 335                 ;;
 336         --ignore-whitespace)
 337                 git_am_opt="$git_am_opt $1"
 338                 ;;
 339         --committer-date-is-author-date|--ignore-date)
 340                 git_am_opt="$git_am_opt $1"
 341                 force_rebase=t
 342                 ;;
 343         -C*)
 344                 git_am_opt="$git_am_opt $1"
 345                 ;;
 346         --root)
 347                 rebase_root=t
 348                 ;;
 349         -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 350                 force_rebase=t
 351                 ;;
 352         --rerere-autoupdate|--no-rerere-autoupdate)
 353                 allow_rerere_autoupdate="$1"
 354                 ;;
 355         -x)
 356                 git_am_opt="$git_am_opt --add-commit-name"
 357                 add_commit_name=t
 358                 ;;
 359         -*)
 360                 usage
 361                 ;;
 362         *)
 363                 break
 364                 ;;
 365         esac
 366         shift
 367 done
 368 test $# -gt 2 && usage
 369
 370 if test $# -eq 0 && test -z "$rebase_root"
 371 then
 372         test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
 373         test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing &&
 374                 die 'A rebase is in progress, try --continue, --skip or --abort.'
 375 fi
 376
 377 # Make sure we do not have $GIT_DIR/rebase-apply
 378 if test -z "$do_merge"
 379 then
 380         if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
 381         then
 382                 rmdir "$GIT_DIR"/rebase-apply
 383         else
 384                 echo >&2 '
 385 It seems that I cannot create a rebase-apply directory, and
 386 I wonder if you are in the middle of patch application or another
 387 rebase.  If that is not the case, please
 388         rm -fr '"$GIT_DIR"'/rebase-apply
 389 and run me again.  I am stopping in case you still have something
 390 valuable there.'
 391                 exit 1
 392         fi
 393 else
 394         if test -d "$dotest"
 395         then
 396                 die "previous rebase directory $dotest still exists." \
 397                         'Try git rebase (--continue | --abort | --skip)'
 398         fi
 399         if test -n "$add_commit_name"
 400         then
 401                 die "-x not compatible with --merge"
 402         fi
 403 fi
 404
 405 # The tree must be really really clean.
 406 if ! git update-index --ignore-submodules --refresh > /dev/null; then
 407         echo >&2 "cannot rebase: you have unstaged changes"
 408         git diff-files --name-status -r --ignore-submodules -- >&2
 409         exit 1
 410 fi
 411 diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)
 412 case "$diff" in
 413 ?*)     echo >&2 "cannot rebase: your index contains uncommitted changes"
 414         echo >&2 "$diff"
 415         exit 1
 416         ;;
 417 esac
 418
 419 if test -z "$rebase_root"
 420 then
 421         # The upstream head must be given.  Make sure it is valid.
 422         upstream_name="$1"
 423         shift
 424         upstream=`git rev-parse --verify "${upstream_name}^0"` ||
 425         die "invalid upstream $upstream_name"
 426         unset root_flag
 427         upstream_arg="$upstream_name"
 428 else
 429         test -z "$newbase" && die "--root must be used with --onto"
 430         unset upstream_name
 431         unset upstream
 432         root_flag="--root"
 433         upstream_arg="$root_flag"
 434 fi
 435
 436 # Make sure the branch to rebase onto is valid.
 437 onto_name=${newbase-"$upstream_name"}
 438 case "$onto_name" in
 439 *...*)
 440         if      left=${onto_name%...*} right=${onto_name#*...} &&
 441                 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
 442         then
 443                 case "$onto" in
 444                 ?*"$LF"?*)
 445                         die "$onto_name: there are more than one merge bases"
 446                         ;;
 447                 '')
 448                         die "$onto_name: there is no merge base"
 449                         ;;
 450                 esac
 451         else
 452                 die "$onto_name: there is no merge base"
 453         fi
 454         ;;
 455 *)
 456         onto=$(git rev-parse --verify "${onto_name}^0") || exit
 457         ;;
 458 esac
 459
 460 # If a hook exists, give it a chance to interrupt
 461 run_pre_rebase_hook "$upstream_arg" "$@"
 462
 463 # If the branch to rebase is given, that is the branch we will rebase
 464 # $branch_name -- branch being rebased, or HEAD (already detached)
 465 # $orig_head -- commit object name of tip of the branch before rebasing
 466 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
 467 switch_to=
 468 case "$#" in
 469 1)
 470         # Is it "rebase other $branchname" or "rebase other $commit"?
 471         branch_name="$1"
 472         switch_to="$1"
 473
 474         if git show-ref --verify --quiet -- "refs/heads/$1" &&
 475            branch=$(git rev-parse -q --verify "refs/heads/$1")
 476         then
 477                 head_name="refs/heads/$1"
 478         elif branch=$(git rev-parse -q --verify "$1")
 479         then
 480                 head_name="detached HEAD"
 481         else
 482                 usage
 483         fi
 484         ;;
 485 *)
 486         # Do not need to switch branches, we are already on it.
 487         if branch_name=`git symbolic-ref -q HEAD`
 488         then
 489                 head_name=$branch_name
 490                 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
 491         else
 492                 head_name="detached HEAD"
 493                 branch_name=HEAD ;# detached
 494         fi
 495         branch=$(git rev-parse --verify "${branch_name}^0") || exit
 496         ;;
 497 esac
 498 orig_head=$branch
 499
 500 # Now we are rebasing commits $upstream..$branch (or with --root,
 501 # everything leading up to $branch) on top of $onto
 502
 503 # Check if we are already based on $onto with linear history,
 504 # but this should be done only when upstream and onto are the same.
 505 mb=$(git merge-base "$onto" "$branch")
 506 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
 507         # linear history?
 508         ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null
 509 then
 510         if test -z "$force_rebase"
 511         then
 512                 # Lazily switch to the target branch if needed...
 513                 test -z "$switch_to" || git checkout "$switch_to"
 514                 say "Current branch $branch_name is up to date."
 515                 exit 0
 516         else
 517                 say "Current branch $branch_name is up to date, rebase forced."
 518         fi
 519 fi
 520
 521 # Detach HEAD and reset the tree
 522 say "First, rewinding head to replay your work on top of it..."
 523 git checkout -q "$onto^0" || die "could not detach HEAD"
 524 git update-ref ORIG_HEAD $branch
 525
 526 if test -n "$diffstat"
 527 then
 528         if test -n "$verbose"
 529         then
 530                 echo "Changes from $mb to $onto:"
 531         fi
 532         # We want color (if set), but no pager
 533         GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
 534 fi
 535
 536 # If the $onto is a proper descendant of the tip of the branch, then
 537 # we just fast-forwarded.
 538 if test "$mb" = "$branch"
 539 then
 540         say "Fast-forwarded $branch_name to $onto_name."
 541         move_to_original_branch
 542         exit 0
 543 fi
 544
 545 if test -n "$rebase_root"
 546 then
 547         revisions="$onto..$orig_head"
 548 else
 549         revisions="$upstream..$orig_head"
 550 fi
 551
 552 if test -z "$do_merge"
 553 then
 554         git format-patch -k --stdout --full-index --ignore-if-in-upstream \
 555                 $root_flag "$revisions" |
 556         git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
 557         move_to_original_branch
 558         ret=$?
 559         test 0 != $ret -a -d "$GIT_DIR"/rebase-apply &&
 560                 echo $head_name > "$GIT_DIR"/rebase-apply/head-name &&
 561                 echo $onto > "$GIT_DIR"/rebase-apply/onto &&
 562                 echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head &&
 563                 echo "$GIT_QUIET" > "$GIT_DIR"/rebase-apply/quiet
 564         exit $ret
 565 fi
 566
 567 # start doing a rebase with git-merge
 568 # this is rename-aware if the recursive (default) strategy is used
 569
 570 mkdir -p "$dotest"
 571 echo "$onto" > "$dotest/onto"
 572 echo "$onto_name" > "$dotest/onto_name"
 573 prev_head=$orig_head
 574 echo "$prev_head" > "$dotest/prev_head"
 575 echo "$orig_head" > "$dotest/orig-head"
 576 echo "$head_name" > "$dotest/head-name"
 577 echo "$GIT_QUIET" > "$dotest/quiet"
 578
 579 msgnum=0
 580 for cmt in `git rev-list --reverse --no-merges "$revisions"`
 581 do
 582         msgnum=$(($msgnum + 1))
 583         echo "$cmt" > "$dotest/cmt.$msgnum"
 584 done
 585
 586 echo 1 >"$dotest/msgnum"
 587 echo $msgnum >"$dotest/end"
 588
 589 end=$msgnum
 590 msgnum=1
 591
 592 while test "$msgnum" -le "$end"
 593 do
 594         call_merge "$msgnum"
 595         continue_merge
 596 done
 597
 598 finish_rb_merge