Merge commit 'git/master'
[git/git-bigfiles.git] / git-rebase.sh
blob0ade6992289a807a268ad887d8a71ba54a87cf49
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano.
6 USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<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
26 / --> /
27 D---E---F---G master D---E---F---G master
30 SUBDIRECTORY_OK=Yes
31 OPTIONS_SPEC=
32 . git-sh-setup
33 set_reflog_action rebase
34 require_work_tree
35 cd_to_toplevel
37 OK_TO_SKIP_PRE_REBASE=
38 RESOLVEMSG="
39 When you have resolved this problem run \"git rebase --continue\".
40 If you would prefer to skip this patch, instead run \"git rebase --skip\".
41 To restore the original branch and stop rebasing run \"git rebase --abort\".
43 unset newbase
44 strategy=recursive
45 do_merge=
46 dotest="$GIT_DIR"/rebase-merge
47 prec=4
48 verbose=
49 diffstat=$(git config --bool rebase.stat)
50 git_am_opt=
51 rebase_root=
52 force_rebase=
54 continue_merge () {
55 test -n "$prev_head" || die "prev_head must be defined"
56 test -d "$dotest" || die "$dotest directory does not exist"
58 unmerged=$(git ls-files -u)
59 if test -n "$unmerged"
60 then
61 echo "You still have unmerged paths in your index"
62 echo "did you forget to use git add?"
63 die "$RESOLVEMSG"
66 cmt=`cat "$dotest/current"`
67 if ! git diff-index --quiet --ignore-submodules HEAD --
68 then
69 if ! git commit --no-verify -C "$cmt"
70 then
71 echo "Commit failed, please do not call \"git commit\""
72 echo "directly, but instead do one of the following: "
73 die "$RESOLVEMSG"
75 printf "Committed: %0${prec}d " $msgnum
76 else
77 printf "Already applied: %0${prec}d " $msgnum
79 git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
81 prev_head=`git rev-parse HEAD^0`
82 # save the resulting commit so we can read-tree on it later
83 echo "$prev_head" > "$dotest/prev_head"
85 # onto the next patch:
86 msgnum=$(($msgnum + 1))
87 echo "$msgnum" >"$dotest/msgnum"
90 call_merge () {
91 cmt="$(cat "$dotest/cmt.$1")"
92 echo "$cmt" > "$dotest/current"
93 hd=$(git rev-parse --verify HEAD)
94 cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
95 msgnum=$(cat "$dotest/msgnum")
96 end=$(cat "$dotest/end")
97 eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
98 eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
99 export GITHEAD_$cmt GITHEAD_$hd
100 git-merge-$strategy "$cmt^" -- "$hd" "$cmt"
101 rv=$?
102 case "$rv" in
104 unset GITHEAD_$cmt GITHEAD_$hd
105 return
108 git rerere
109 die "$RESOLVEMSG"
112 echo "Strategy: $rv $strategy failed, try another" 1>&2
113 die "$RESOLVEMSG"
116 die "Unknown exit code ($rv) from command:" \
117 "git-merge-$strategy $cmt^ -- HEAD $cmt"
119 esac
122 move_to_original_branch () {
123 test -z "$head_name" &&
124 head_name="$(cat "$dotest"/head-name)" &&
125 onto="$(cat "$dotest"/onto)" &&
126 orig_head="$(cat "$dotest"/orig-head)"
127 case "$head_name" in
128 refs/*)
129 message="rebase finished: $head_name onto $onto"
130 git update-ref -m "$message" \
131 $head_name $(git rev-parse HEAD) $orig_head &&
132 git symbolic-ref HEAD $head_name ||
133 die "Could not move back to $head_name"
135 esac
138 finish_rb_merge () {
139 move_to_original_branch
140 rm -r "$dotest"
141 echo "All done."
144 is_interactive () {
145 while test $# != 0
147 case "$1" in
148 -i|--interactive)
149 interactive_rebase=explicit
150 break
152 -p|--preserve-merges)
153 interactive_rebase=implied
155 esac
156 shift
157 done
159 if [ "$interactive_rebase" = implied ]; then
160 GIT_EDITOR=:
161 export GIT_EDITOR
164 test -n "$interactive_rebase" || test -f "$dotest"/interactive
167 run_pre_rebase_hook () {
168 if test -z "$OK_TO_SKIP_PRE_REBASE" &&
169 test -x "$GIT_DIR/hooks/pre-rebase"
170 then
171 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
172 echo >&2 "The pre-rebase hook refused to rebase."
173 exit 1
178 test -f "$GIT_DIR"/rebase-apply/applying &&
179 die 'It looks like git-am is in progress. Cannot rebase.'
181 is_interactive "$@" && exec git-rebase--interactive "$@"
183 if test $# -eq 0
184 then
185 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
186 test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing &&
187 die 'A rebase is in progress, try --continue, --skip or --abort.'
188 die "No arguments given and $GIT_DIR/rebase-apply already exists."
191 while test $# != 0
193 case "$1" in
194 --no-verify)
195 OK_TO_SKIP_PRE_REBASE=yes
197 --continue)
198 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
199 die "No rebase in progress?"
201 git diff-files --quiet --ignore-submodules || {
202 echo "You must edit all merge conflicts and then"
203 echo "mark them as resolved using git add"
204 exit 1
206 if test -d "$dotest"
207 then
208 prev_head=$(cat "$dotest/prev_head")
209 end=$(cat "$dotest/end")
210 msgnum=$(cat "$dotest/msgnum")
211 onto=$(cat "$dotest/onto")
212 continue_merge
213 while test "$msgnum" -le "$end"
215 call_merge "$msgnum"
216 continue_merge
217 done
218 finish_rb_merge
219 exit
221 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
222 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
223 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
224 git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
225 move_to_original_branch
226 exit
228 --skip)
229 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
230 die "No rebase in progress?"
232 git reset --hard HEAD || exit $?
233 if test -d "$dotest"
234 then
235 git rerere clear
236 prev_head=$(cat "$dotest/prev_head")
237 end=$(cat "$dotest/end")
238 msgnum=$(cat "$dotest/msgnum")
239 msgnum=$(($msgnum + 1))
240 onto=$(cat "$dotest/onto")
241 while test "$msgnum" -le "$end"
243 call_merge "$msgnum"
244 continue_merge
245 done
246 finish_rb_merge
247 exit
249 head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
250 onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
251 orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
252 git am -3 --skip --resolvemsg="$RESOLVEMSG" &&
253 move_to_original_branch
254 exit
256 --abort)
257 test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
258 die "No rebase in progress?"
260 git rerere clear
261 if test -d "$dotest"
262 then
263 move_to_original_branch
264 else
265 dotest="$GIT_DIR"/rebase-apply
266 move_to_original_branch
268 git reset --hard $(cat "$dotest/orig-head")
269 rm -r "$dotest"
270 exit
272 --onto)
273 test 2 -le "$#" || usage
274 newbase="$2"
275 shift
277 -M|-m|--m|--me|--mer|--merg|--merge)
278 do_merge=t
280 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
281 --strateg=*|--strategy=*|\
282 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
283 case "$#,$1" in
284 *,*=*)
285 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
286 1,*)
287 usage ;;
289 strategy="$2"
290 shift ;;
291 esac
292 do_merge=t
294 -n|--no-stat)
295 diffstat=
297 --stat)
298 diffstat=t
300 -v|--verbose)
301 verbose=t
302 diffstat=t
304 --whitespace=*)
305 git_am_opt="$git_am_opt $1"
306 case "$1" in
307 --whitespace=fix|--whitespace=strip)
308 force_rebase=t
310 esac
312 --committer-date-is-author-date|--ignore-date)
313 git_am_opt="$git_am_opt $1"
314 force_rebase=t
316 -C*)
317 git_am_opt="$git_am_opt $1"
319 --root)
320 rebase_root=t
322 -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase)
323 force_rebase=t
326 usage
329 break
331 esac
332 shift
333 done
334 test $# -gt 2 && usage
336 # Make sure we do not have $GIT_DIR/rebase-apply
337 if test -z "$do_merge"
338 then
339 if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
340 then
341 rmdir "$GIT_DIR"/rebase-apply
342 else
343 echo >&2 '
344 It seems that I cannot create a rebase-apply directory, and
345 I wonder if you are in the middle of patch application or another
346 rebase. If that is not the case, please
347 rm -fr '"$GIT_DIR"'/rebase-apply
348 and run me again. I am stopping in case you still have something
349 valuable there.'
350 exit 1
352 else
353 if test -d "$dotest"
354 then
355 die "previous rebase directory $dotest still exists." \
356 'Try git rebase (--continue | --abort | --skip)'
360 # The tree must be really really clean.
361 if ! git update-index --ignore-submodules --refresh; then
362 echo >&2 "cannot rebase: you have unstaged changes"
363 exit 1
365 diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)
366 case "$diff" in
367 ?*) echo >&2 "cannot rebase: your index contains uncommitted changes"
368 echo >&2 "$diff"
369 exit 1
371 esac
373 if test -z "$rebase_root"
374 then
375 # The upstream head must be given. Make sure it is valid.
376 upstream_name="$1"
377 shift
378 upstream=`git rev-parse --verify "${upstream_name}^0"` ||
379 die "invalid upstream $upstream_name"
380 unset root_flag
381 upstream_arg="$upstream_name"
382 else
383 test -z "$newbase" && die "--root must be used with --onto"
384 unset upstream_name
385 unset upstream
386 root_flag="--root"
387 upstream_arg="$root_flag"
390 # Make sure the branch to rebase onto is valid.
391 onto_name=${newbase-"$upstream_name"}
392 onto=$(git rev-parse --verify "${onto_name}^0") || exit
394 # If a hook exists, give it a chance to interrupt
395 run_pre_rebase_hook "$upstream_arg" "$@"
397 # If the branch to rebase is given, that is the branch we will rebase
398 # $branch_name -- branch being rebased, or HEAD (already detached)
399 # $orig_head -- commit object name of tip of the branch before rebasing
400 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
401 switch_to=
402 case "$#" in
404 # Is it "rebase other $branchname" or "rebase other $commit"?
405 branch_name="$1"
406 switch_to="$1"
408 if git show-ref --verify --quiet -- "refs/heads/$1" &&
409 branch=$(git rev-parse -q --verify "refs/heads/$1")
410 then
411 head_name="refs/heads/$1"
412 elif branch=$(git rev-parse -q --verify "$1")
413 then
414 head_name="detached HEAD"
415 else
416 usage
420 # Do not need to switch branches, we are already on it.
421 if branch_name=`git symbolic-ref -q HEAD`
422 then
423 head_name=$branch_name
424 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
425 else
426 head_name="detached HEAD"
427 branch_name=HEAD ;# detached
429 branch=$(git rev-parse --verify "${branch_name}^0") || exit
431 esac
432 orig_head=$branch
434 # Now we are rebasing commits $upstream..$branch (or with --root,
435 # everything leading up to $branch) on top of $onto
437 # Check if we are already based on $onto with linear history,
438 # but this should be done only when upstream and onto are the same.
439 mb=$(git merge-base "$onto" "$branch")
440 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
441 # linear history?
442 ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null
443 then
444 if test -z "$force_rebase"
445 then
446 # Lazily switch to the target branch if needed...
447 test -z "$switch_to" || git checkout "$switch_to"
448 echo >&2 "Current branch $branch_name is up to date."
449 exit 0
450 else
451 echo "Current branch $branch_name is up to date, rebase forced."
455 # Detach HEAD and reset the tree
456 echo "First, rewinding head to replay your work on top of it..."
457 git checkout -q "$onto^0" || die "could not detach HEAD"
458 git update-ref ORIG_HEAD $branch
460 if test -n "$diffstat"
461 then
462 if test -n "$verbose"
463 then
464 echo "Changes from $mb to $onto:"
466 # We want color (if set), but no pager
467 GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
470 # If the $onto is a proper descendant of the tip of the branch, then
471 # we just fast forwarded.
472 if test "$mb" = "$branch"
473 then
474 echo >&2 "Fast-forwarded $branch_name to $onto_name."
475 move_to_original_branch
476 exit 0
479 if test -n "$rebase_root"
480 then
481 revisions="$onto..$orig_head"
482 else
483 revisions="$upstream..$orig_head"
486 if test -z "$do_merge"
487 then
488 git format-patch -k --stdout --full-index --ignore-if-in-upstream \
489 $root_flag "$revisions" |
490 git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
491 move_to_original_branch
492 ret=$?
493 test 0 != $ret -a -d "$GIT_DIR"/rebase-apply &&
494 echo $head_name > "$GIT_DIR"/rebase-apply/head-name &&
495 echo $onto > "$GIT_DIR"/rebase-apply/onto &&
496 echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head
497 exit $ret
500 # start doing a rebase with git-merge
501 # this is rename-aware if the recursive (default) strategy is used
503 mkdir -p "$dotest"
504 echo "$onto" > "$dotest/onto"
505 echo "$onto_name" > "$dotest/onto_name"
506 prev_head=$orig_head
507 echo "$prev_head" > "$dotest/prev_head"
508 echo "$orig_head" > "$dotest/orig-head"
509 echo "$head_name" > "$dotest/head-name"
511 msgnum=0
512 for cmt in `git rev-list --reverse --no-merges "$revisions"`
514 msgnum=$(($msgnum + 1))
515 echo "$cmt" > "$dotest/cmt.$msgnum"
516 done
518 echo 1 >"$dotest/msgnum"
519 echo $msgnum >"$dotest/end"
521 end=$msgnum
522 msgnum=1
524 while test "$msgnum" -le "$end"
526 call_merge "$msgnum"
527 continue_merge
528 done
530 finish_rb_merge