]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
b2f82e05 | 6 | USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>]' |
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 | |
c4427656 | 37 | OK_TO_SKIP_PRE_REBASE= |
cc120056 SE |
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\". | |
42 | " | |
e646c9c8 | 43 | unset newbase |
a06f678e | 44 | strategy=recursive |
58634dbf | 45 | do_merge= |
28ed6e7b | 46 | dotest="$GIT_DIR"/rebase-merge |
58634dbf | 47 | prec=4 |
b758789c | 48 | verbose= |
a9c3821c | 49 | diffstat=$(git config --bool rebase.stat) |
67dad687 | 50 | git_am_opt= |
190f5323 | 51 | rebase_root= |
b2f82e05 | 52 | force_rebase= |
58634dbf EW |
53 | |
54 | continue_merge () { | |
55 | test -n "$prev_head" || die "prev_head must be defined" | |
56 | test -d "$dotest" || die "$dotest directory does not exist" | |
57 | ||
5be60078 | 58 | unmerged=$(git ls-files -u) |
58634dbf EW |
59 | if test -n "$unmerged" |
60 | then | |
61 | echo "You still have unmerged paths in your index" | |
9b07873a | 62 | echo "did you forget to use git add?" |
66eb64cb | 63 | die "$RESOLVEMSG" |
58634dbf EW |
64 | fi |
65 | ||
889a50e9 | 66 | cmt=`cat "$dotest/current"` |
6848d58c | 67 | if ! git diff-index --quiet --ignore-submodules HEAD -- |
58634dbf | 68 | then |
e637122e | 69 | if ! git commit --no-verify -C "$cmt" |
f0ef0596 EW |
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" | |
74 | fi | |
7afa845e | 75 | printf "Committed: %0${prec}d " $msgnum |
58634dbf | 76 | else |
7afa845e | 77 | printf "Already applied: %0${prec}d " $msgnum |
58634dbf | 78 | fi |
c7965afd | 79 | git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //' |
58634dbf | 80 | |
5be60078 | 81 | prev_head=`git rev-parse HEAD^0` |
58634dbf | 82 | # save the resulting commit so we can read-tree on it later |
58634dbf EW |
83 | echo "$prev_head" > "$dotest/prev_head" |
84 | ||
85 | # onto the next patch: | |
86 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 87 | echo "$msgnum" >"$dotest/msgnum" |
58634dbf EW |
88 | } |
89 | ||
90 | call_merge () { | |
889a50e9 | 91 | cmt="$(cat "$dotest/cmt.$1")" |
58634dbf | 92 | echo "$cmt" > "$dotest/current" |
5be60078 | 93 | hd=$(git rev-parse --verify HEAD) |
6fd2f5e6 | 94 | cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) |
889a50e9 JS |
95 | msgnum=$(cat "$dotest/msgnum") |
96 | end=$(cat "$dotest/end") | |
0bb733c9 | 97 | eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' |
889a50e9 | 98 | eval GITHEAD_$hd='$(cat "$dotest/onto_name")' |
0bb733c9 SP |
99 | export GITHEAD_$cmt GITHEAD_$hd |
100 | git-merge-$strategy "$cmt^" -- "$hd" "$cmt" | |
58634dbf EW |
101 | rv=$? |
102 | case "$rv" in | |
103 | 0) | |
0bb733c9 | 104 | unset GITHEAD_$cmt GITHEAD_$hd |
9e4bc7dd | 105 | return |
58634dbf EW |
106 | ;; |
107 | 1) | |
b4372ef1 | 108 | git rerere |
66eb64cb | 109 | die "$RESOLVEMSG" |
58634dbf EW |
110 | ;; |
111 | 2) | |
112 | echo "Strategy: $rv $strategy failed, try another" 1>&2 | |
66eb64cb | 113 | die "$RESOLVEMSG" |
58634dbf EW |
114 | ;; |
115 | *) | |
116 | die "Unknown exit code ($rv) from command:" \ | |
117 | "git-merge-$strategy $cmt^ -- HEAD $cmt" | |
118 | ;; | |
119 | esac | |
120 | } | |
121 | ||
6fd2f5e6 JS |
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" | |
134 | ;; | |
135 | esac | |
136 | } | |
137 | ||
58634dbf | 138 | finish_rb_merge () { |
6fd2f5e6 | 139 | move_to_original_branch |
58634dbf EW |
140 | rm -r "$dotest" |
141 | echo "All done." | |
142 | } | |
143 | ||
1b1dce4b | 144 | is_interactive () { |
f8cca019 AE |
145 | while test $# != 0 |
146 | do | |
147 | case "$1" in | |
148 | -i|--interactive) | |
149 | interactive_rebase=explicit | |
150 | break | |
151 | ;; | |
152 | -p|--preserve-merges) | |
153 | interactive_rebase=implied | |
154 | ;; | |
155 | esac | |
1b1dce4b | 156 | shift |
f8cca019 AE |
157 | done |
158 | ||
159 | if [ "$interactive_rebase" = implied ]; then | |
160 | GIT_EDITOR=: | |
161 | export GIT_EDITOR | |
162 | fi | |
163 | ||
164 | test -n "$interactive_rebase" || test -f "$dotest"/interactive | |
1b1dce4b JS |
165 | } |
166 | ||
d70b4a8f | 167 | run_pre_rebase_hook () { |
c4427656 NS |
168 | if test -z "$OK_TO_SKIP_PRE_REBASE" && |
169 | test -x "$GIT_DIR/hooks/pre-rebase" | |
d70b4a8f NS |
170 | then |
171 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { | |
172 | echo >&2 "The pre-rebase hook refused to rebase." | |
173 | exit 1 | |
174 | } | |
175 | fi | |
176 | } | |
177 | ||
9b752a6e SB |
178 | test -f "$GIT_DIR"/rebase-apply/applying && |
179 | die 'It looks like git-am is in progress. Cannot rebase.' | |
180 | ||
1b1dce4b JS |
181 | is_interactive "$@" && exec git-rebase--interactive "$@" |
182 | ||
9b752a6e SB |
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." | |
189 | fi | |
190 | ||
822f7c73 | 191 | while test $# != 0 |
e646c9c8 JH |
192 | do |
193 | case "$1" in | |
c4427656 NS |
194 | --no-verify) |
195 | OK_TO_SKIP_PRE_REBASE=yes | |
196 | ;; | |
031321c6 | 197 | --continue) |
51ef1daa | 198 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
199 | die "No rebase in progress?" |
200 | ||
6848d58c | 201 | git diff-files --quiet --ignore-submodules || { |
06aff47b | 202 | echo "You must edit all merge conflicts and then" |
9b07873a | 203 | echo "mark them as resolved using git add" |
031321c6 | 204 | exit 1 |
06aff47b | 205 | } |
58634dbf EW |
206 | if test -d "$dotest" |
207 | then | |
889a50e9 JS |
208 | prev_head=$(cat "$dotest/prev_head") |
209 | end=$(cat "$dotest/end") | |
210 | msgnum=$(cat "$dotest/msgnum") | |
211 | onto=$(cat "$dotest/onto") | |
58634dbf EW |
212 | continue_merge |
213 | while test "$msgnum" -le "$end" | |
214 | do | |
215 | call_merge "$msgnum" | |
216 | continue_merge | |
217 | done | |
218 | finish_rb_merge | |
219 | exit | |
220 | fi | |
51ef1daa JS |
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) && | |
3f735b66 JS |
224 | git am --resolved --3way --resolvemsg="$RESOLVEMSG" && |
225 | move_to_original_branch | |
cc120056 SE |
226 | exit |
227 | ;; | |
228 | --skip) | |
51ef1daa | 229 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
230 | die "No rebase in progress?" |
231 | ||
fb6e4e1f | 232 | git reset --hard HEAD || exit $? |
58634dbf EW |
233 | if test -d "$dotest" |
234 | then | |
b4372ef1 | 235 | git rerere clear |
889a50e9 JS |
236 | prev_head=$(cat "$dotest/prev_head") |
237 | end=$(cat "$dotest/end") | |
238 | msgnum=$(cat "$dotest/msgnum") | |
d5e673b6 | 239 | msgnum=$(($msgnum + 1)) |
889a50e9 | 240 | onto=$(cat "$dotest/onto") |
d5e673b6 EW |
241 | while test "$msgnum" -le "$end" |
242 | do | |
243 | call_merge "$msgnum" | |
244 | continue_merge | |
245 | done | |
246 | finish_rb_merge | |
247 | exit | |
58634dbf | 248 | fi |
51ef1daa JS |
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) && | |
6fd2f5e6 JS |
252 | git am -3 --skip --resolvemsg="$RESOLVEMSG" && |
253 | move_to_original_branch | |
031321c6 SE |
254 | exit |
255 | ;; | |
256 | --abort) | |
51ef1daa | 257 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
258 | die "No rebase in progress?" |
259 | ||
b4372ef1 | 260 | git rerere clear |
58634dbf EW |
261 | if test -d "$dotest" |
262 | then | |
6fd2f5e6 | 263 | move_to_original_branch |
cd5320f2 | 264 | else |
51ef1daa | 265 | dotest="$GIT_DIR"/rebase-apply |
6fd2f5e6 | 266 | move_to_original_branch |
58634dbf | 267 | fi |
97b88dd5 | 268 | git reset --hard $(cat "$dotest/orig-head") |
48411d22 | 269 | rm -r "$dotest" |
031321c6 SE |
270 | exit |
271 | ;; | |
e646c9c8 JH |
272 | --onto) |
273 | test 2 -le "$#" || usage | |
274 | newbase="$2" | |
275 | shift | |
276 | ;; | |
58634dbf EW |
277 | -M|-m|--m|--me|--mer|--merg|--merge) |
278 | do_merge=t | |
279 | ;; | |
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 | *,*=*) | |
8096fae7 | 285 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
58634dbf EW |
286 | 1,*) |
287 | usage ;; | |
288 | *) | |
289 | strategy="$2" | |
290 | shift ;; | |
291 | esac | |
292 | do_merge=t | |
293 | ;; | |
a9c3821c TAV |
294 | -n|--no-stat) |
295 | diffstat= | |
296 | ;; | |
297 | --stat) | |
298 | diffstat=t | |
299 | ;; | |
b758789c RS |
300 | -v|--verbose) |
301 | verbose=t | |
a9c3821c | 302 | diffstat=t |
b758789c | 303 | ;; |
059f446d BF |
304 | --whitespace=*) |
305 | git_am_opt="$git_am_opt $1" | |
b2f82e05 SR |
306 | case "$1" in |
307 | --whitespace=fix|--whitespace=strip) | |
308 | force_rebase=t | |
309 | ;; | |
310 | esac | |
059f446d | 311 | ;; |
570ccad3 MB |
312 | --committer-date-is-author-date|--ignore-date) |
313 | git_am_opt="$git_am_opt $1" | |
314 | force_rebase=t | |
315 | ;; | |
67dad687 | 316 | -C*) |
059f446d | 317 | git_am_opt="$git_am_opt $1" |
67dad687 | 318 | ;; |
190f5323 TR |
319 | --root) |
320 | rebase_root=t | |
321 | ;; | |
3f7d9928 | 322 | -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase) |
b2f82e05 SR |
323 | force_rebase=t |
324 | ;; | |
e646c9c8 JH |
325 | -*) |
326 | usage | |
327 | ;; | |
328 | *) | |
329 | break | |
330 | ;; | |
331 | esac | |
332 | shift | |
333 | done | |
51b2ead0 | 334 | test $# -gt 2 && usage |
2db8aaec | 335 | |
51ef1daa | 336 | # Make sure we do not have $GIT_DIR/rebase-apply |
58634dbf | 337 | if test -z "$do_merge" |
7f4bd5d8 | 338 | then |
9b752a6e | 339 | if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null |
58634dbf | 340 | then |
51ef1daa | 341 | rmdir "$GIT_DIR"/rebase-apply |
58634dbf EW |
342 | else |
343 | echo >&2 ' | |
9b752a6e SB |
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 | |
51ef1daa JS |
346 | rebase. If that is not the case, please |
347 | rm -fr '"$GIT_DIR"'/rebase-apply | |
9b752a6e | 348 | and run me again. I am stopping in case you still have something |
51ef1daa | 349 | valuable there.' |
58634dbf EW |
350 | exit 1 |
351 | fi | |
352 | else | |
353 | if test -d "$dotest" | |
354 | then | |
28ed6e7b | 355 | die "previous rebase directory $dotest still exists." \ |
9b752a6e | 356 | 'Try git rebase (--continue | --abort | --skip)' |
58634dbf | 357 | fi |
7f4bd5d8 JH |
358 | fi |
359 | ||
7f59dbbb | 360 | # The tree must be really really clean. |
07e62b73 JK |
361 | if ! git update-index --ignore-submodules --refresh; then |
362 | echo >&2 "cannot rebase: you have unstaged changes" | |
363 | exit 1 | |
364 | fi | |
6848d58c | 365 | diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) |
32d99544 | 366 | case "$diff" in |
07e62b73 JK |
367 | ?*) echo >&2 "cannot rebase: your index contains uncommitted changes" |
368 | echo >&2 "$diff" | |
7f59dbbb JH |
369 | exit 1 |
370 | ;; | |
371 | esac | |
99a92f92 | 372 | |
190f5323 TR |
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" | |
388 | fi | |
32d99544 | 389 | |
a1bf91e0 JH |
390 | # Make sure the branch to rebase onto is valid. |
391 | onto_name=${newbase-"$upstream_name"} | |
5be60078 | 392 | onto=$(git rev-parse --verify "${onto_name}^0") || exit |
a1bf91e0 | 393 | |
9a111c91 | 394 | # If a hook exists, give it a chance to interrupt |
190f5323 | 395 | run_pre_rebase_hook "$upstream_arg" "$@" |
9a111c91 | 396 | |
0cb06644 JH |
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= | |
59e6b23a | 402 | case "$#" in |
190f5323 | 403 | 1) |
0cb06644 | 404 | # Is it "rebase other $branchname" or "rebase other $commit"? |
190f5323 TR |
405 | branch_name="$1" |
406 | switch_to="$1" | |
0cb06644 | 407 | |
190f5323 TR |
408 | if git show-ref --verify --quiet -- "refs/heads/$1" && |
409 | branch=$(git rev-parse -q --verify "refs/heads/$1") | |
0cb06644 | 410 | then |
190f5323 TR |
411 | head_name="refs/heads/$1" |
412 | elif branch=$(git rev-parse -q --verify "$1") | |
0cb06644 JH |
413 | then |
414 | head_name="detached HEAD" | |
415 | else | |
416 | usage | |
417 | fi | |
e646c9c8 JH |
418 | ;; |
419 | *) | |
0cb06644 | 420 | # Do not need to switch branches, we are already on it. |
bcf31618 JH |
421 | if branch_name=`git symbolic-ref -q HEAD` |
422 | then | |
0cb06644 | 423 | head_name=$branch_name |
bcf31618 JH |
424 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` |
425 | else | |
0cb06644 | 426 | head_name="detached HEAD" |
bcf31618 JH |
427 | branch_name=HEAD ;# detached |
428 | fi | |
0cb06644 | 429 | branch=$(git rev-parse --verify "${branch_name}^0") || exit |
e646c9c8 | 430 | ;; |
59e6b23a | 431 | esac |
0cb06644 | 432 | orig_head=$branch |
59e6b23a | 433 | |
190f5323 TR |
434 | # Now we are rebasing commits $upstream..$branch (or with --root, |
435 | # everything leading up to $branch) on top of $onto | |
e646c9c8 | 436 | |
1308c17b JS |
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. | |
5be60078 | 439 | mb=$(git merge-base "$onto" "$branch") |
1308c17b JS |
440 | if test "$upstream" = "$onto" && test "$mb" = "$onto" && |
441 | # linear history? | |
bbf08124 | 442 | ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null |
7f4bd5d8 | 443 | then |
b2f82e05 SR |
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." | |
452 | fi | |
7f4bd5d8 JH |
453 | fi |
454 | ||
0cb06644 | 455 | # Detach HEAD and reset the tree |
228e2eb6 | 456 | echo "First, rewinding head to replay your work on top of it..." |
324c2c31 | 457 | git checkout -q "$onto^0" || die "could not detach HEAD" |
22e40795 | 458 | git update-ref ORIG_HEAD $branch |
32d99544 | 459 | |
a9c3821c TAV |
460 | if test -n "$diffstat" |
461 | then | |
462 | if test -n "$verbose" | |
463 | then | |
464 | echo "Changes from $mb to $onto:" | |
465 | fi | |
466 | # We want color (if set), but no pager | |
467 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" | |
468 | fi | |
469 | ||
e646c9c8 | 470 | # If the $onto is a proper descendant of the tip of the branch, then |
32d99544 | 471 | # we just fast forwarded. |
83c31614 | 472 | if test "$mb" = "$branch" |
32d99544 | 473 | then |
d587ed13 | 474 | echo >&2 "Fast-forwarded $branch_name to $onto_name." |
6fd2f5e6 | 475 | move_to_original_branch |
32d99544 LS |
476 | exit 0 |
477 | fi | |
478 | ||
190f5323 TR |
479 | if test -n "$rebase_root" |
480 | then | |
481 | revisions="$onto..$orig_head" | |
482 | else | |
483 | revisions="$upstream..$orig_head" | |
484 | fi | |
485 | ||
58634dbf EW |
486 | if test -z "$do_merge" |
487 | then | |
0cb06644 | 488 | git format-patch -k --stdout --full-index --ignore-if-in-upstream \ |
190f5323 | 489 | $root_flag "$revisions" | |
3041c324 | 490 | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && |
6fd2f5e6 JS |
491 | move_to_original_branch |
492 | ret=$? | |
51ef1daa JS |
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 | |
6fd2f5e6 | 497 | exit $ret |
58634dbf EW |
498 | fi |
499 | ||
500 | # start doing a rebase with git-merge | |
501 | # this is rename-aware if the recursive (default) strategy is used | |
502 | ||
503 | mkdir -p "$dotest" | |
504 | echo "$onto" > "$dotest/onto" | |
0bb733c9 | 505 | echo "$onto_name" > "$dotest/onto_name" |
6fd2f5e6 | 506 | prev_head=$orig_head |
58634dbf | 507 | echo "$prev_head" > "$dotest/prev_head" |
6fd2f5e6 JS |
508 | echo "$orig_head" > "$dotest/orig-head" |
509 | echo "$head_name" > "$dotest/head-name" | |
58634dbf EW |
510 | |
511 | msgnum=0 | |
190f5323 | 512 | for cmt in `git rev-list --reverse --no-merges "$revisions"` |
58634dbf EW |
513 | do |
514 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 515 | echo "$cmt" > "$dotest/cmt.$msgnum" |
58634dbf EW |
516 | done |
517 | ||
5887ac82 JH |
518 | echo 1 >"$dotest/msgnum" |
519 | echo $msgnum >"$dotest/end" | |
58634dbf EW |
520 | |
521 | end=$msgnum | |
522 | msgnum=1 | |
523 | ||
524 | while test "$msgnum" -le "$end" | |
525 | do | |
526 | call_merge "$msgnum" | |
527 | continue_merge | |
528 | done | |
cc120056 | 529 | |
58634dbf | 530 | finish_rb_merge |