1#!/bin/sh 2# 3# Copyright (c) 2005 Junio C Hamano. 4# 5 6USAGE='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>]' 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 .dotest working files, use the command 18git rebase --abort instead. 19 20Note that if <branch> is not specified on the command line, the 21currently checked out branch is used. You must be in the top 22directory of your project to start (or continue) a rebase. 23 24Example: git-rebase master~1 topic 25 26 A---B---C topic A'\''--B'\''--C'\'' topic 27 / --> / 28 D---E---F---G master D---E---F---G master 29' 30 31SUBDIRECTORY_OK=Yes 32. git-sh-setup 33set_reflog_action rebase 34require_work_tree 35cd_to_toplevel 36 37RESOLVEMSG=" 38When you have resolved this problem run\"git rebase --continue\". 39If you would prefer to skip this patch, instead run\"git rebase --skip\". 40To restore the original branch and stop rebasing run\"git rebase --abort\". 41" 42unset newbase 43strategy=recursive 44do_merge= 45dotest=$GIT_DIR/.dotest-merge 46prec=4 47verbose= 48git_am_opt= 49 50continue_merge () { 51test -n"$prev_head"|| die "prev_head must be defined" 52test -d"$dotest"|| die "$dotestdirectory does not exist" 53 54 unmerged=$(git ls-files -u) 55iftest -n"$unmerged" 56then 57echo"You still have unmerged paths in your index" 58echo"did you forget to use git add?" 59 die "$RESOLVEMSG" 60fi 61 62 cmt=`cat "$dotest/current"` 63if! git diff-index --quiet HEAD 64then 65if! git-commit -C"$cmt" 66then 67echo"Commit failed, please do not call\"git commit\"" 68echo"directly, but instead do one of the following: " 69 die "$RESOLVEMSG" 70fi 71printf"Committed: %0${prec}d "$msgnum 72else 73printf"Already applied: %0${prec}d "$msgnum 74fi 75 git rev-list --pretty=oneline -1"$cmt"|sed-e's/^[^ ]* //' 76 77 prev_head=`git rev-parse HEAD^0` 78# save the resulting commit so we can read-tree on it later 79echo"$prev_head">"$dotest/prev_head" 80 81# onto the next patch: 82 msgnum=$(($msgnum + 1)) 83echo"$msgnum">"$dotest/msgnum" 84} 85 86call_merge () { 87 cmt="$(cat "$dotest/cmt.$1")" 88echo"$cmt">"$dotest/current" 89 hd=$(git rev-parse --verify HEAD) 90 cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) 91 msgnum=$(cat "$dotest/msgnum") 92 end=$(cat "$dotest/end") 93eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' 94eval GITHEAD_$hd='$(cat "$dotest/onto_name")' 95export GITHEAD_$cmt GITHEAD_$hd 96 git-merge-$strategy"$cmt^"--"$hd""$cmt" 97 rv=$? 98case"$rv"in 990) 100unset GITHEAD_$cmt GITHEAD_$hd 101return 102;; 1031) 104 git rerere 105 die "$RESOLVEMSG" 106;; 1072) 108echo"Strategy:$rv$strategyfailed, try another"1>&2 109 die "$RESOLVEMSG" 110;; 111*) 112 die "Unknown exit code ($rv) from command:" \ 113"git-merge-$strategy$cmt^ -- HEAD$cmt" 114;; 115esac 116} 117 118move_to_original_branch () { 119test -z"$head_name"&& 120 head_name="$(cat "$dotest"/head-name)"&& 121 onto="$(cat "$dotest"/onto)"&& 122 orig_head="$(cat "$dotest"/orig-head)" 123case"$head_name"in 124 refs/*) 125 message="rebase finished:$head_nameonto$onto" 126 git update-ref -m"$message" \ 127$head_name $(git rev-parse HEAD) $orig_head&& 128 git symbolic-ref HEAD $head_name|| 129 die "Could not move back to$head_name" 130;; 131esac 132} 133 134finish_rb_merge () { 135 move_to_original_branch 136rm-r"$dotest" 137echo"All done." 138} 139 140is_interactive () { 141test -f"$dotest"/interactive || 142while:;do case$#,"$1"in0,|*,-i|*,--interactive)break;;esac 143shift 144done&&test -n"$1" 145} 146 147is_interactive "$@"&&exec git-rebase--interactive"$@" 148 149whiletest$#!=0 150do 151case"$1"in 152--continue) 153 git diff-files --quiet|| { 154echo"You must edit all merge conflicts and then" 155echo"mark them as resolved using git add" 156exit1 157} 158iftest -d"$dotest" 159then 160 prev_head=$(cat "$dotest/prev_head") 161 end=$(cat "$dotest/end") 162 msgnum=$(cat "$dotest/msgnum") 163 onto=$(cat "$dotest/onto") 164 continue_merge 165whiletest"$msgnum"-le"$end" 166do 167 call_merge "$msgnum" 168 continue_merge 169done 170 finish_rb_merge 171exit 172fi 173 git am --resolved --3way --resolvemsg="$RESOLVEMSG" 174exit 175;; 176--skip) 177iftest -d"$dotest" 178then 179 git rerere clear 180 prev_head=$(cat "$dotest/prev_head") 181 end=$(cat "$dotest/end") 182 msgnum=$(cat "$dotest/msgnum") 183 msgnum=$(($msgnum + 1)) 184 onto=$(cat "$dotest/onto") 185whiletest"$msgnum"-le"$end" 186do 187 call_merge "$msgnum" 188 continue_merge 189done 190 finish_rb_merge 191exit 192fi 193 head_name=$(cat .dotest/head-name)&& 194 onto=$(cat .dotest/onto)&& 195 orig_head=$(cat .dotest/orig-head)&& 196 git am -3 --skip --resolvemsg="$RESOLVEMSG"&& 197 move_to_original_branch 198exit 199;; 200--abort) 201 git rerere clear 202iftest -d"$dotest" 203then 204 move_to_original_branch 205rm-r"$dotest" 206eliftest -d .dotest 207then 208 dotest=.dotest 209 move_to_original_branch 210rm-r .dotest 211else 212 die "No rebase in progress?" 213fi 214 git reset--hard ORIG_HEAD 215exit 216;; 217--onto) 218test2-le"$#"|| usage 219 newbase="$2" 220shift 221;; 222-M|-m|--m|--me|--mer|--merg|--merge) 223 do_merge=t 224;; 225-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ 226--strateg=*|--strategy=*|\ 227-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) 228case"$#,$1"in 229*,*=*) 230 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'`;; 2311,*) 232 usage ;; 233*) 234 strategy="$2" 235shift;; 236esac 237 do_merge=t 238;; 239-v|--verbose) 240 verbose=t 241;; 242--whitespace=*) 243 git_am_opt="$git_am_opt$1" 244;; 245-C*) 246 git_am_opt="$git_am_opt$1" 247;; 248-*) 249 usage 250;; 251*) 252break 253;; 254esac 255shift 256done 257 258# Make sure we do not have .dotest 259iftest -z"$do_merge" 260then 261ifmkdir .dotest 262then 263rmdir .dotest 264else 265echo>&2' 266It seems that I cannot create a .dotest directory, and I wonder if you 267are in the middle of patch application or another rebase. If that is not 268the case, please rm -fr .dotest and run me again. I am stopping in case 269you still have something valuable there.' 270exit1 271fi 272else 273iftest -d"$dotest" 274then 275 die "previous dotest directory$doteststill exists." \ 276'try git-rebase < --continue | --abort >' 277fi 278fi 279 280# The tree must be really really clean. 281git update-index --refresh||exit 282diff=$(git diff-index --cached --name-status -r HEAD) 283case"$diff"in 284?*)echo"cannot rebase: your index is not up-to-date" 285echo"$diff" 286exit1 287;; 288esac 289 290# The upstream head must be given. Make sure it is valid. 291upstream_name="$1" 292upstream=`git rev-parse --verify "${upstream_name}^0"`|| 293 die "invalid upstream$upstream_name" 294 295# Make sure the branch to rebase onto is valid. 296onto_name=${newbase-"$upstream_name"} 297onto=$(git rev-parse --verify "${onto_name}^0")||exit 298 299# If a hook exists, give it a chance to interrupt 300iftest -x"$GIT_DIR/hooks/pre-rebase" 301then 302"$GIT_DIR/hooks/pre-rebase"${1+"$@"}|| { 303echo>&2"The pre-rebase hook refused to rebase." 304exit1 305} 306fi 307 308# If the branch to rebase is given, first switch to it. 309case"$#"in 3102) 311 branch_name="$2" 312 git-checkout"$2"|| usage 313;; 314*) 315if branch_name=`git symbolic-ref -q HEAD` 316then 317 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` 318else 319 branch_name=HEAD ;# detached 320fi 321;; 322esac 323branch=$(git rev-parse --verify "${branch_name}^0")||exit 324 325# Now we are rebasing commits $upstream..$branch on top of $onto 326 327# Check if we are already based on $onto with linear history, 328# but this should be done only when upstream and onto are the same. 329mb=$(git merge-base "$onto" "$branch") 330iftest"$upstream"="$onto"&&test"$mb"="$onto"&& 331# linear history? 332! git rev-list --parents"$onto".."$branch"|grep" .* "> /dev/null 333then 334echo>&2"Current branch$branch_nameis up to date." 335exit0 336fi 337 338iftest -n"$verbose" 339then 340echo"Changes from$mbto$onto:" 341# We want color (if set), but no pager 342 GIT_PAGER='' git diff--stat --summary"$mb""$onto" 343fi 344 345# move to a detached HEAD 346orig_head=$(git rev-parse HEAD^0) 347head_name=$(git symbolic-ref HEAD 2> /dev/null) 348case"$head_name"in 349'') 350 head_name="detached HEAD" 351;; 352*) 353 git checkout "$orig_head"> /dev/null 2>&1|| 354 die "could not detach HEAD" 355;; 356esac 357 358# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. 359echo"First, rewinding head to replay your work on top of it..." 360git-reset --hard"$onto" 361 362# If the $onto is a proper descendant of the tip of the branch, then 363# we just fast forwarded. 364iftest"$mb"="$branch" 365then 366echo>&2"Fast-forwarded$branch_nameto$onto_name." 367 move_to_original_branch 368exit0 369fi 370 371iftest -z"$do_merge" 372then 373 git format-patch -k --stdout --full-index --ignore-if-in-upstream"$upstream"..ORIG_HEAD | 374 git am $git_am_opt--binary -3 -k --resolvemsg="$RESOLVEMSG"&& 375 move_to_original_branch 376 ret=$? 377test0!=$ret-a -d .dotest && 378echo$head_name> .dotest/head-name&& 379echo$onto> .dotest/onto && 380echo$orig_head> .dotest/orig-head 381exit$ret 382fi 383 384# start doing a rebase with git-merge 385# this is rename-aware if the recursive (default) strategy is used 386 387mkdir-p"$dotest" 388echo"$onto">"$dotest/onto" 389echo"$onto_name">"$dotest/onto_name" 390prev_head=$orig_head 391echo"$prev_head">"$dotest/prev_head" 392echo"$orig_head">"$dotest/orig-head" 393echo"$head_name">"$dotest/head-name" 394 395msgnum=0 396for cmt in`git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD` 397do 398 msgnum=$(($msgnum + 1)) 399echo"$cmt">"$dotest/cmt.$msgnum" 400done 401 402echo1>"$dotest/msgnum" 403echo$msgnum>"$dotest/end" 404 405end=$msgnum 406msgnum=1 407 408whiletest"$msgnum"-le"$end" 409do 410 call_merge "$msgnum" 411 continue_merge 412done 413 414finish_rb_merge