3 # Copyright (c) 2005 Junio C Hamano.
6 USAGE
='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>]'
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.
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.
20 Note that if <branch> is not specified on the command line, the
21 currently checked out branch is used.
23 Example: git-rebase master~1 topic
25 A---B---C topic A'\''--B'\''--C'\'' topic
27 D---E---F---G master D---E---F---G master
33 set_reflog_action rebase
38 When you have resolved this problem run \"git rebase --continue\".
39 If you would prefer to skip this patch, instead run \"git rebase --skip\".
40 To restore the original branch and stop rebasing run \"git rebase --abort\".
45 dotest
="$GIT_DIR"/rebase-merge
51 test -n "$prev_head" || die
"prev_head must be defined"
52 test -d "$dotest" || die
"$dotest directory does not exist"
54 unmerged
=$
(git ls-files
-u)
55 if test -n "$unmerged"
57 echo "You still have unmerged paths in your index"
58 echo "did you forget to use git add?"
62 cmt
=`cat "$dotest/current"`
63 if ! git diff-index
--quiet --ignore-submodules HEAD
--
65 if ! git commit
--no-verify -C "$cmt"
67 echo "Commit failed, please do not call \"git commit\""
68 echo "directly, but instead do one of the following: "
71 printf "Committed: %0${prec}d " $msgnum
73 printf "Already applied: %0${prec}d " $msgnum
75 git rev-list
--pretty=oneline
-1 "$cmt" |
sed -e 's/^[^ ]* //'
77 prev_head
=`git rev-parse HEAD^0`
78 # save the resulting commit so we can read-tree on it later
79 echo "$prev_head" > "$dotest/prev_head"
81 # onto the next patch:
82 msgnum
=$
(($msgnum + 1))
83 echo "$msgnum" >"$dotest/msgnum"
87 cmt
="$(cat "$dotest/cmt.
$1")"
88 echo "$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")
93 eval GITHEAD_
$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
94 eval GITHEAD_
$hd='$(cat "$dotest/onto_name")'
95 export GITHEAD_
$cmt GITHEAD_
$hd
96 git-merge-
$strategy "$cmt^" -- "$hd" "$cmt"
100 unset GITHEAD_
$cmt GITHEAD_
$hd
108 echo "Strategy: $rv $strategy failed, try another" 1>&2
112 die
"Unknown exit code ($rv) from command:" \
113 "git-merge-$strategy $cmt^ -- HEAD $cmt"
118 move_to_original_branch
() {
119 test -z "$head_name" &&
120 head_name
="$(cat "$dotest"/head-name)" &&
121 onto
="$(cat "$dotest"/onto)" &&
122 orig_head
="$(cat "$dotest"/orig-head)"
125 message
="rebase finished: $head_name onto $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"
135 move_to_original_branch
141 test -f "$dotest"/interactive ||
142 while :; do case $#,"$1" in 0,|
*,-i|
*,--interactive) break ;; esac
147 run_pre_rebase_hook
() {
148 if test -x "$GIT_DIR/hooks/pre-rebase"
150 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
{
151 echo >&2 "The pre-rebase hook refused to rebase."
157 test -f "$GIT_DIR"/rebase-apply
/applying
&&
158 die
'It looks like git-am is in progress. Cannot rebase.'
160 is_interactive
"$@" && exec git-rebase--interactive
"$@"
164 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
165 test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply
/rebasing
&&
166 die
'A rebase is in progress, try --continue, --skip or --abort.'
167 die
"No arguments given and $GIT_DIR/rebase-apply already exists."
174 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
175 die
"No rebase in progress?"
177 git diff-files
--quiet --ignore-submodules ||
{
178 echo "You must edit all merge conflicts and then"
179 echo "mark them as resolved using git add"
184 prev_head
=$
(cat "$dotest/prev_head")
185 end
=$
(cat "$dotest/end")
186 msgnum
=$
(cat "$dotest/msgnum")
187 onto
=$
(cat "$dotest/onto")
189 while test "$msgnum" -le "$end"
197 head_name
=$
(cat "$GIT_DIR"/rebase-apply
/head-name
) &&
198 onto
=$
(cat "$GIT_DIR"/rebase-apply
/onto
) &&
199 orig_head
=$
(cat "$GIT_DIR"/rebase-apply
/orig-head
) &&
200 git am
--resolved --3way --resolvemsg="$RESOLVEMSG" &&
201 move_to_original_branch
205 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
206 die
"No rebase in progress?"
208 git
reset --hard HEAD ||
exit $?
212 prev_head
=$
(cat "$dotest/prev_head")
213 end
=$
(cat "$dotest/end")
214 msgnum
=$
(cat "$dotest/msgnum")
215 msgnum
=$
(($msgnum + 1))
216 onto
=$
(cat "$dotest/onto")
217 while test "$msgnum" -le "$end"
225 head_name
=$
(cat "$GIT_DIR"/rebase-apply
/head-name
) &&
226 onto
=$
(cat "$GIT_DIR"/rebase-apply
/onto
) &&
227 orig_head
=$
(cat "$GIT_DIR"/rebase-apply
/orig-head
) &&
228 git am
-3 --skip --resolvemsg="$RESOLVEMSG" &&
229 move_to_original_branch
233 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
234 die
"No rebase in progress?"
239 move_to_original_branch
241 dotest
="$GIT_DIR"/rebase-apply
242 move_to_original_branch
244 git
reset --hard $
(cat "$dotest/orig-head")
249 test 2 -le "$#" || usage
253 -M|
-m|
--m|
--me|
--mer|
--merg|
--merge)
256 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
257 --strateg=*|
--strategy=*|\
258 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
261 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
274 git_am_opt
="$git_am_opt $1"
277 git_am_opt
="$git_am_opt $1"
289 # Make sure we do not have $GIT_DIR/rebase-apply
290 if test -z "$do_merge"
292 if mkdir
"$GIT_DIR"/rebase-apply
2>/dev
/null
294 rmdir "$GIT_DIR"/rebase-apply
297 It seems that I cannot create a rebase-apply directory, and
298 I wonder if you are in the middle of patch application or another
299 rebase. If that is not the case, please
300 rm -fr '"$GIT_DIR"'/rebase-apply
301 and run me again. I am stopping in case you still have something
308 die
"previous rebase directory $dotest still exists." \
309 'Try git rebase (--continue | --abort | --skip)'
313 # The tree must be really really clean.
314 git update-index
--ignore-submodules --refresh ||
exit
315 diff=$
(git diff-index
--cached --name-status -r --ignore-submodules HEAD
--)
317 ?
*) echo "cannot rebase: your index is not up-to-date"
323 # The upstream head must be given. Make sure it is valid.
325 upstream
=`git rev-parse --verify "${upstream_name}^0"` ||
326 die
"invalid upstream $upstream_name"
328 # Make sure the branch to rebase onto is valid.
329 onto_name
=${newbase-"$upstream_name"}
330 onto
=$
(git rev-parse
--verify "${onto_name}^0") ||
exit
332 # If a hook exists, give it a chance to interrupt
333 run_pre_rebase_hook
${1+"$@"}
335 # If the branch to rebase is given, that is the branch we will rebase
336 # $branch_name -- branch being rebased, or HEAD (already detached)
337 # $orig_head -- commit object name of tip of the branch before rebasing
338 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
342 # Is it "rebase other $branchname" or "rebase other $commit"?
346 if git show-ref
--verify --quiet -- "refs/heads/$2" &&
347 branch
=$
(git rev-parse
--verify "refs/heads/$2" 2>/dev
/null
)
349 head_name
="refs/heads/$2"
350 elif branch
=$
(git rev-parse
--verify "$2" 2>/dev
/null
)
352 head_name
="detached HEAD"
358 # Do not need to switch branches, we are already on it.
359 if branch_name
=`git symbolic-ref -q HEAD`
361 head_name
=$branch_name
362 branch_name
=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
364 head_name
="detached HEAD"
365 branch_name
=HEAD
;# detached
367 branch
=$
(git rev-parse
--verify "${branch_name}^0") ||
exit
372 # Now we are rebasing commits $upstream..$branch on top of $onto
374 # Check if we are already based on $onto with linear history,
375 # but this should be done only when upstream and onto are the same.
376 mb
=$
(git merge-base
"$onto" "$branch")
377 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
379 ! (git rev-list
--parents "$onto"..
"$branch" |
grep " .* ") > /dev
/null
381 # Lazily switch to the target branch if needed...
382 test -z "$switch_to" || git checkout
"$switch_to"
383 echo >&2 "Current branch $branch_name is up to date."
387 if test -n "$verbose"
389 echo "Changes from $mb to $onto:"
390 # We want color (if set), but no pager
391 GIT_PAGER
='' git
diff --stat --summary "$mb" "$onto"
394 # Detach HEAD and reset the tree
395 echo "First, rewinding head to replay your work on top of it..."
396 git checkout
-q "$onto^0" || die
"could not detach HEAD"
397 git update-ref ORIG_HEAD
$branch
399 # If the $onto is a proper descendant of the tip of the branch, then
400 # we just fast forwarded.
401 if test "$mb" = "$branch"
403 echo >&2 "Fast-forwarded $branch_name to $onto_name."
404 move_to_original_branch
408 if test -z "$do_merge"
410 git format-patch
-k --stdout --full-index --ignore-if-in-upstream \
411 "$upstream..$orig_head" |
412 git am
$git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
413 move_to_original_branch
415 test 0 != $ret -a -d "$GIT_DIR"/rebase-apply
&&
416 echo $head_name > "$GIT_DIR"/rebase-apply
/head-name
&&
417 echo $onto > "$GIT_DIR"/rebase-apply
/onto
&&
418 echo $orig_head > "$GIT_DIR"/rebase-apply
/orig-head
422 # start doing a rebase with git-merge
423 # this is rename-aware if the recursive (default) strategy is used
426 echo "$onto" > "$dotest/onto"
427 echo "$onto_name" > "$dotest/onto_name"
429 echo "$prev_head" > "$dotest/prev_head"
430 echo "$orig_head" > "$dotest/orig-head"
431 echo "$head_name" > "$dotest/head-name"
434 for cmt
in `git rev-list --reverse --no-merges "$upstream..$orig_head"`
436 msgnum
=$
(($msgnum + 1))
437 echo "$cmt" > "$dotest/cmt.$msgnum"
440 echo 1 >"$dotest/msgnum"
441 echo $msgnum >"$dotest/end"
446 while test "$msgnum" -le "$end"