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