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