git.oblomov.eu Git - git/blob - 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 strategy_opts=
  48 do_merge=
  49 dotest="$GIT_DIR"/rebase-merge
  50 prec=4
  51 verbose=
  52 diffstat=$(git config --bool rebase.stat)
  53 git_am_opt=
  54 rebase_root=
  55 force_rebase=
  56 allow_rerere_autoupdate=
  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                 GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
 115         fi
 116         eval 'git-merge-$strategy' $strategy_opts '"$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 update-index --ignore-submodules --refresh &&
 213                 git diff-files --quiet --ignore-submodules || {
 214                         echo "You must edit all merge conflicts and then"
 215                         echo "mark them as resolved using git add"
 216                         exit 1
 217                 }
 218                 if test -d "$dotest"
 219                 then
 220                         prev_head=$(cat "$dotest/prev_head")
 221                         end=$(cat "$dotest/end")
 222                         msgnum=$(cat "$dotest/msgnum")
 223                         onto=$(cat "$dotest/onto")
 224                         GIT_QUIET=$(cat "$dotest/quiet")
 225                         continue_merge
 226                         while test "$msgnum" -le "$end"
 227                         do
 228                                 call_merge "$msgnum"
 229                                 continue_merge
 230                         done
 231                         finish_rb_merge
 232                         exit
 233                 fi
 234                 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
 235                 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
 236                 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
 237                 GIT_QUIET=$(cat "$GIT_DIR"/rebase-apply/quiet)
 238                 git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
 239                 move_to_original_branch
 240                 exit
 241                 ;;
 242         --skip)
 243                 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
 244                         die "No rebase in progress?"
 245
 246                 git reset --hard HEAD || exit $?
 247                 if test -d "$dotest"
 248                 then
 249                         git rerere clear
 250                         prev_head=$(cat "$dotest/prev_head")
 251                         end=$(cat "$dotest/end")
 252                         msgnum=$(cat "$dotest/msgnum")
 253                         msgnum=$(($msgnum + 1))
 254                         onto=$(cat "$dotest/onto")
 255                         GIT_QUIET=$(cat "$dotest/quiet")
 256                         while test "$msgnum" -le "$end"
 257                         do
 258                                 call_merge "$msgnum"
 259                                 continue_merge
 260                         done
 261                         finish_rb_merge
 262                         exit
 263                 fi
 264                 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
 265                 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
 266                 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
 267                 GIT_QUIET=$(cat "$GIT_DIR"/rebase-apply/quiet)
 268                 git am -3 --skip --resolvemsg="$RESOLVEMSG" &&
 269                 move_to_original_branch
 270                 exit
 271                 ;;
 272         --abort)
 273                 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
 274                         die "No rebase in progress?"
 275
 276                 git rerere clear
 277
 278                 test -d "$dotest" || dotest="$GIT_DIR"/rebase-apply
 279
 280                 head_name="$(cat "$dotest"/head-name)" &&
 281                 case "$head_name" in
 282                 refs/*)
 283                         git symbolic-ref HEAD $head_name ||
 284                         die "Could not move back to $head_name"
 285                         ;;
 286                 esac
 287                 git reset --hard $(cat "$dotest/orig-head")
 288                 rm -r "$dotest"
 289                 exit
 290                 ;;
 291         --onto)
 292                 test 2 -le "$#" || usage
 293                 newbase="$2"
 294                 shift
 295                 ;;
 296         -M|-m|--m|--me|--mer|--merg|--merge)
 297                 do_merge=t
 298                 ;;
 299         -X*|--strategy-option*)
 300                 case "$#,$1" in
 301                 1,-X|1,--strategy-option)
 302                         usage ;;
 303                 *,-X|*,--strategy-option)
 304                         newopt="$2"
 305                         shift ;;
 306                 *,--strategy-option=*)
 307                         newopt="$(expr " $1" : ' --strategy-option=\(.*\)')" ;;
 308                 *,-X*)
 309                         newopt="$(expr " $1" : ' -X\(.*\)')" ;;
 310                 1,*)
 311                         usage ;;
 312                 esac
 313                 strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
 314                 do_merge=t
 315                 ;;
 316         -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
 317                 --strateg=*|--strategy=*|\
 318         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
 319                 case "$#,$1" in
 320                 *,*=*)
 321                         strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
 322                 1,*)
 323                         usage ;;
 324                 *)
 325                         strategy="$2"
 326                         shift ;;
 327                 esac
 328                 do_merge=t
 329                 ;;
 330         -n|--no-stat)
 331                 diffstat=
 332                 ;;
 333         --stat)
 334                 diffstat=t
 335                 ;;
 336         -v|--verbose)
 337                 verbose=t
 338                 diffstat=t
 339                 GIT_QUIET=
 340                 ;;
 341         -q|--quiet)
 342                 GIT_QUIET=t
 343                 git_am_opt="$git_am_opt -q"
 344                 verbose=
 345                 diffstat=
 346                 ;;
 347         --whitespace=*)
 348                 git_am_opt="$git_am_opt $1"
 349                 case "$1" in
 350                 --whitespace=fix|--whitespace=strip)
 351                         force_rebase=t
 352                         ;;
 353                 esac
 354                 ;;
 355         --ignore-whitespace)
 356                 git_am_opt="$git_am_opt $1"
 357                 ;;
 358         --committer-date-is-author-date|--ignore-date)
 359                 git_am_opt="$git_am_opt $1"
 360                 force_rebase=t
 361                 ;;
 362         -C*)
 363                 git_am_opt="$git_am_opt $1"
 364                 ;;
 365         --root)
 366                 rebase_root=t
 367                 ;;
 368         -f|--f|--fo|--for|--forc|--force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 369                 force_rebase=t
 370                 ;;
 371         --rerere-autoupdate|--no-rerere-autoupdate)
 372                 allow_rerere_autoupdate="$1"
 373                 ;;
 374         -*)
 375                 usage
 376                 ;;
 377         *)
 378                 break
 379                 ;;
 380         esac
 381         shift
 382 done
 383 test $# -gt 2 && usage
 384
 385 if test $# -eq 0 && test -z "$rebase_root"
 386 then
 387         test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
 388         test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing &&
 389                 die 'A rebase is in progress, try --continue, --skip or --abort.'
 390 fi
 391
 392 # Make sure we do not have $GIT_DIR/rebase-apply
 393 if test -z "$do_merge"
 394 then
 395         if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
 396         then
 397                 rmdir "$GIT_DIR"/rebase-apply
 398         else
 399                 echo >&2 '
 400 It seems that I cannot create a rebase-apply directory, and
 401 I wonder if you are in the middle of patch application or another
 402 rebase.  If that is not the case, please
 403         rm -fr '"$GIT_DIR"'/rebase-apply
 404 and run me again.  I am stopping in case you still have something
 405 valuable there.'
 406                 exit 1
 407         fi
 408 else
 409         if test -d "$dotest"
 410         then
 411                 die "previous rebase directory $dotest still exists." \
 412                         'Try git rebase (--continue | --abort | --skip)'
 413         fi
 414 fi
 415
 416 # The tree must be really really clean.
 417 if ! git update-index --ignore-submodules --refresh > /dev/null; then
 418         echo >&2 "cannot rebase: you have unstaged changes"
 419         git diff-files --name-status -r --ignore-submodules -- >&2
 420         exit 1
 421 fi
 422 diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)
 423 case "$diff" in
 424 ?*)     echo >&2 "cannot rebase: your index contains uncommitted changes"
 425         echo >&2 "$diff"
 426         exit 1
 427         ;;
 428 esac
 429
 430 if test -z "$rebase_root"
 431 then
 432         # The upstream head must be given.  Make sure it is valid.
 433         upstream_name="$1"
 434         shift
 435         upstream=`git rev-parse --verify "${upstream_name}^0"` ||
 436         die "invalid upstream $upstream_name"
 437         unset root_flag
 438         upstream_arg="$upstream_name"
 439 else
 440         test -z "$newbase" && die "--root must be used with --onto"
 441         unset upstream_name
 442         unset upstream
 443         root_flag="--root"
 444         upstream_arg="$root_flag"
 445 fi
 446
 447 # Make sure the branch to rebase onto is valid.
 448 onto_name=${newbase-"$upstream_name"}
 449 case "$onto_name" in
 450 *...*)
 451         if      left=${onto_name%...*} right=${onto_name#*...} &&
 452                 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
 453         then
 454                 case "$onto" in
 455                 ?*"$LF"?*)
 456                         die "$onto_name: there are more than one merge bases"
 457                         ;;
 458                 '')
 459                         die "$onto_name: there is no merge base"
 460                         ;;
 461                 esac
 462         else
 463                 die "$onto_name: there is no merge base"
 464         fi
 465         ;;
 466 *)
 467         onto=$(git rev-parse --verify "${onto_name}^0") || exit
 468         ;;
 469 esac
 470
 471 # If a hook exists, give it a chance to interrupt
 472 run_pre_rebase_hook "$upstream_arg" "$@"
 473
 474 # If the branch to rebase is given, that is the branch we will rebase
 475 # $branch_name -- branch being rebased, or HEAD (already detached)
 476 # $orig_head -- commit object name of tip of the branch before rebasing
 477 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
 478 switch_to=
 479 case "$#" in
 480 1)
 481         # Is it "rebase other $branchname" or "rebase other $commit"?
 482         branch_name="$1"
 483         switch_to="$1"
 484
 485         if git show-ref --verify --quiet -- "refs/heads/$1" &&
 486            branch=$(git rev-parse -q --verify "refs/heads/$1")
 487         then
 488                 head_name="refs/heads/$1"
 489         elif branch=$(git rev-parse -q --verify "$1")
 490         then
 491                 head_name="detached HEAD"
 492         else
 493                 usage
 494         fi
 495         ;;
 496 *)
 497         # Do not need to switch branches, we are already on it.
 498         if branch_name=`git symbolic-ref -q HEAD`
 499         then
 500                 head_name=$branch_name
 501                 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
 502         else
 503                 head_name="detached HEAD"
 504                 branch_name=HEAD ;# detached
 505         fi
 506         branch=$(git rev-parse --verify "${branch_name}^0") || exit
 507         ;;
 508 esac
 509 orig_head=$branch
 510
 511 # Now we are rebasing commits $upstream..$branch (or with --root,
 512 # everything leading up to $branch) on top of $onto
 513
 514 # Check if we are already based on $onto with linear history,
 515 # but this should be done only when upstream and onto are the same.
 516 mb=$(git merge-base "$onto" "$branch")
 517 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
 518         # linear history?
 519         ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null
 520 then
 521         if test -z "$force_rebase"
 522         then
 523                 # Lazily switch to the target branch if needed...
 524                 test -z "$switch_to" || git checkout "$switch_to"
 525                 say "Current branch $branch_name is up to date."
 526                 exit 0
 527         else
 528                 say "Current branch $branch_name is up to date, rebase forced."
 529         fi
 530 fi
 531
 532 # Detach HEAD and reset the tree
 533 say "First, rewinding head to replay your work on top of it..."
 534 git checkout -q "$onto^0" || die "could not detach HEAD"
 535 git update-ref ORIG_HEAD $branch
 536
 537 if test -n "$diffstat"
 538 then
 539         if test -n "$verbose"
 540         then
 541                 echo "Changes from $mb to $onto:"
 542         fi
 543         # We want color (if set), but no pager
 544         GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
 545 fi
 546
 547 # If the $onto is a proper descendant of the tip of the branch, then
 548 # we just fast-forwarded.
 549 if test "$mb" = "$branch"
 550 then
 551         say "Fast-forwarded $branch_name to $onto_name."
 552         move_to_original_branch
 553         exit 0
 554 fi
 555
 556 if test -n "$rebase_root"
 557 then
 558         revisions="$onto..$orig_head"
 559 else
 560         revisions="$upstream..$orig_head"
 561 fi
 562
 563 if test -z "$do_merge"
 564 then
 565         git format-patch -k --stdout --full-index --ignore-if-in-upstream \
 566                 --src-prefix=a/ --dst-prefix=b/ \
 567                 --no-renames $root_flag "$revisions" |
 568         git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
 569         move_to_original_branch
 570         ret=$?
 571         test 0 != $ret -a -d "$GIT_DIR"/rebase-apply &&
 572                 echo $head_name > "$GIT_DIR"/rebase-apply/head-name &&
 573                 echo $onto > "$GIT_DIR"/rebase-apply/onto &&
 574                 echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head &&
 575                 echo "$GIT_QUIET" > "$GIT_DIR"/rebase-apply/quiet
 576         exit $ret
 577 fi
 578
 579 # start doing a rebase with git-merge
 580 # this is rename-aware if the recursive (default) strategy is used
 581
 582 mkdir -p "$dotest"
 583 echo "$onto" > "$dotest/onto"
 584 echo "$onto_name" > "$dotest/onto_name"
 585 prev_head=$orig_head
 586 echo "$prev_head" > "$dotest/prev_head"
 587 echo "$orig_head" > "$dotest/orig-head"
 588 echo "$head_name" > "$dotest/head-name"
 589 echo "$GIT_QUIET" > "$dotest/quiet"
 590
 591 msgnum=0
 592 for cmt in `git rev-list --reverse --no-merges "$revisions"`
 593 do
 594         msgnum=$(($msgnum + 1))
 595         echo "$cmt" > "$dotest/cmt.$msgnum"
 596 done
 597
 598 echo 1 >"$dotest/msgnum"
 599 echo $msgnum >"$dotest/end"
 600
 601 end=$msgnum
 602 msgnum=1
 603
 604 while test "$msgnum" -le "$end"
 605 do
 606         call_merge "$msgnum"
 607         continue_merge
 608 done
 609
 610 finish_rb_merge