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