1#!/bin/sh 2# 3# Copyright (c) 2005 Junio C Hamano. 4# 5 6USAGE='[-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. git-sh-setup 31set_reflog_action rebase 32 33RESOLVEMSG=" 34When you have resolved this problem run\"git rebase --continue\". 35If you would prefer to skip this patch, instead run\"git rebase --skip\". 36To restore the original branch and stop rebasing run\"git rebase --abort\". 37" 38unset newbase 39strategy=recursive 40do_merge= 41dotest=$GIT_DIR/.dotest-merge 42prec=4 43verbose= 44 45continue_merge () { 46test -n"$prev_head"|| die "prev_head must be defined" 47test -d"$dotest"|| die "$dotestdirectory does not exist" 48 49 unmerged=$(git-ls-files -u) 50iftest -n"$unmerged" 51then 52echo"You still have unmerged paths in your index" 53echo"did you forget update-index?" 54 die "$RESOLVEMSG" 55fi 56 57iftest -n"`git-diff-index HEAD`" 58then 59if! git-commit -C"`cat$dotest/current`" 60then 61echo"Commit failed, please do not call\"git commit\"" 62echo"directly, but instead do one of the following: " 63 die "$RESOLVEMSG" 64fi 65printf"Committed: %0${prec}d"$msgnum 66else 67printf"Already applied: %0${prec}d"$msgnum 68fi 69echo' '`git-rev-list --pretty=oneline -1 HEAD | \ 70 sed 's/^[a-f0-9]\+ //'` 71 72 prev_head=`git-rev-parse HEAD^0` 73# save the resulting commit so we can read-tree on it later 74echo"$prev_head">"$dotest/prev_head" 75 76# onto the next patch: 77 msgnum=$(($msgnum + 1)) 78echo"$msgnum">"$dotest/msgnum" 79} 80 81call_merge () { 82 cmt="$(cat $dotest/cmt.$1)" 83echo"$cmt">"$dotest/current" 84 git-merge-$strategy"$cmt^"-- HEAD "$cmt" 85 rv=$? 86case"$rv"in 870) 88return 89;; 901) 91test -d"$GIT_DIR/rr-cache"&& git-rerere 92 die "$RESOLVEMSG" 93;; 942) 95echo"Strategy:$rv$strategyfailed, try another"1>&2 96 die "$RESOLVEMSG" 97;; 98*) 99 die "Unknown exit code ($rv) from command:" \ 100"git-merge-$strategy$cmt^ -- HEAD$cmt" 101;; 102esac 103} 104 105finish_rb_merge () { 106rm-r"$dotest" 107echo"All done." 108} 109 110while case"$#"in0)break;;esac 111do 112case"$1"in 113--continue) 114diff=$(git-diff-files) 115case"$diff"in 116 ?*)echo"You must edit all merge conflicts and then" 117echo"mark them as resolved using git update-index" 118exit1 119;; 120esac 121iftest -d"$dotest" 122then 123 prev_head="`cat$dotest/prev_head`" 124 end="`cat$dotest/end`" 125 msgnum="`cat$dotest/msgnum`" 126 onto="`cat$dotest/onto`" 127 continue_merge 128whiletest"$msgnum"-le"$end" 129do 130 call_merge "$msgnum" 131 continue_merge 132done 133 finish_rb_merge 134exit 135fi 136 git am --resolved --3way --resolvemsg="$RESOLVEMSG" 137exit 138;; 139--skip) 140iftest -d"$dotest" 141then 142iftest -d"$GIT_DIR/rr-cache" 143then 144 git-rerereclear 145fi 146 prev_head="`cat$dotest/prev_head`" 147 end="`cat$dotest/end`" 148 msgnum="`cat$dotest/msgnum`" 149 msgnum=$(($msgnum + 1)) 150 onto="`cat$dotest/onto`" 151whiletest"$msgnum"-le"$end" 152do 153 call_merge "$msgnum" 154 continue_merge 155done 156 finish_rb_merge 157exit 158fi 159 git am -3 --skip --resolvemsg="$RESOLVEMSG" 160exit 161;; 162--abort) 163iftest -d"$GIT_DIR/rr-cache" 164then 165 git-rerereclear 166fi 167iftest -d"$dotest" 168then 169rm-r"$dotest" 170eliftest -d .dotest 171then 172rm-r .dotest 173else 174 die "No rebase in progress?" 175fi 176 git reset--hard ORIG_HEAD 177exit 178;; 179--onto) 180test2-le"$#"|| usage 181 newbase="$2" 182shift 183;; 184-M|-m|--m|--me|--mer|--merg|--merge) 185 do_merge=t 186;; 187-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ 188--strateg=*|--strategy=*|\ 189-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) 190case"$#,$1"in 191*,*=*) 192 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'`;; 1931,*) 194 usage ;; 195*) 196 strategy="$2" 197shift;; 198esac 199 do_merge=t 200;; 201-v|--verbose) 202 verbose=t 203;; 204-*) 205 usage 206;; 207*) 208break 209;; 210esac 211shift 212done 213 214# Make sure we do not have .dotest 215iftest -z"$do_merge" 216then 217ifmkdir .dotest 218then 219rmdir .dotest 220else 221echo>&2' 222It seems that I cannot create a .dotest directory, and I wonder if you 223are in the middle of patch application or another rebase. If that is not 224the case, please rm -fr .dotest and run me again. I am stopping in case 225you still have something valuable there.' 226exit1 227fi 228else 229iftest -d"$dotest" 230then 231 die "previous dotest directory$doteststill exists." \ 232'try git-rebase < --continue | --abort >' 233fi 234fi 235 236# The tree must be really really clean. 237git-update-index --refresh||exit 238diff=$(git-diff-index --cached --name-status -r HEAD) 239case"$diff"in 240?*)echo"$diff" 241exit1 242;; 243esac 244 245# The upstream head must be given. Make sure it is valid. 246upstream_name="$1" 247upstream=`git rev-parse --verify "${upstream_name}^0"`|| 248 die "invalid upstream$upstream_name" 249 250# If a hook exists, give it a chance to interrupt 251iftest -x"$GIT_DIR/hooks/pre-rebase" 252then 253"$GIT_DIR/hooks/pre-rebase"${1+"$@"}|| { 254echo>&2"The pre-rebase hook refused to rebase." 255exit1 256} 257fi 258 259# If the branch to rebase is given, first switch to it. 260case"$#"in 2612) 262 branch_name="$2" 263 git-checkout"$2"|| usage 264;; 265*) 266 branch_name=`git symbolic-ref HEAD`|| die "No current branch" 267 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` 268;; 269esac 270branch=$(git-rev-parse --verify "${branch_name}^0")||exit 271 272# Make sure the branch to rebase onto is valid. 273onto_name=${newbase-"$upstream_name"} 274onto=$(git-rev-parse --verify "${onto_name}^0")||exit 275 276# Now we are rebasing commits $upstream..$branch on top of $onto 277 278# Check if we are already based on $onto, but this should be 279# done only when upstream and onto are the same. 280mb=$(git-merge-base "$onto" "$branch") 281iftest"$upstream"="$onto"&&test"$mb"="$onto" 282then 283echo>&2"Current branch$branch_nameis up to date." 284exit0 285fi 286 287iftest -n"$verbose" 288then 289echo"Changes from$mbto$onto:" 290 git-diff-tree --stat --summary"$mb""$onto" 291fi 292 293# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. 294echo"First, rewinding head to replay your work on top of it..." 295git-reset --hard"$onto" 296 297# If the $onto is a proper descendant of the tip of the branch, then 298# we just fast forwarded. 299iftest"$mb"="$branch" 300then 301echo>&2"Fast-forwarded$branch_nameto$onto_name." 302exit0 303fi 304 305iftest -z"$do_merge" 306then 307 git-format-patch -k --stdout --full-index --ignore-if-in-upstream"$upstream"..ORIG_HEAD | 308 git am --binary -3 -k --resolvemsg="$RESOLVEMSG" 309exit $? 310fi 311 312# start doing a rebase with git-merge 313# this is rename-aware if the recursive (default) strategy is used 314 315mkdir-p"$dotest" 316echo"$onto">"$dotest/onto" 317prev_head=`git-rev-parse HEAD^0` 318echo"$prev_head">"$dotest/prev_head" 319 320msgnum=0 321for cmt in`git-rev-list --no-merges "$upstream"..ORIG_HEAD \ 322 | @@PERL@@ -e 'print reverse <>'` 323do 324 msgnum=$(($msgnum + 1)) 325echo"$cmt">"$dotest/cmt.$msgnum" 326done 327 328echo1>"$dotest/msgnum" 329echo$msgnum>"$dotest/end" 330 331end=$msgnum 332msgnum=1 333 334whiletest"$msgnum"-le"$end" 335do 336 call_merge "$msgnum" 337 continue_merge 338done 339 340finish_rb_merge