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