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