]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
1b1dce4b | 6 | USAGE='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<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= |
67dad687 | 49 | git_am_opt= |
58634dbf EW |
50 | |
51 | continue_merge () { | |
52 | test -n "$prev_head" || die "prev_head must be defined" | |
53 | test -d "$dotest" || die "$dotest directory does not exist" | |
54 | ||
5be60078 | 55 | unmerged=$(git ls-files -u) |
58634dbf EW |
56 | if test -n "$unmerged" |
57 | then | |
58 | echo "You still have unmerged paths in your index" | |
9b07873a | 59 | echo "did you forget to use git add?" |
66eb64cb | 60 | die "$RESOLVEMSG" |
58634dbf EW |
61 | fi |
62 | ||
889a50e9 | 63 | cmt=`cat "$dotest/current"` |
6848d58c | 64 | if ! git diff-index --quiet --ignore-submodules HEAD -- |
58634dbf | 65 | then |
e637122e | 66 | if ! git commit --no-verify -C "$cmt" |
f0ef0596 EW |
67 | then |
68 | echo "Commit failed, please do not call \"git commit\"" | |
69 | echo "directly, but instead do one of the following: " | |
70 | die "$RESOLVEMSG" | |
71 | fi | |
7afa845e | 72 | printf "Committed: %0${prec}d " $msgnum |
58634dbf | 73 | else |
7afa845e | 74 | printf "Already applied: %0${prec}d " $msgnum |
58634dbf | 75 | fi |
c7965afd | 76 | git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //' |
58634dbf | 77 | |
5be60078 | 78 | prev_head=`git rev-parse HEAD^0` |
58634dbf | 79 | # save the resulting commit so we can read-tree on it later |
58634dbf EW |
80 | echo "$prev_head" > "$dotest/prev_head" |
81 | ||
82 | # onto the next patch: | |
83 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 84 | echo "$msgnum" >"$dotest/msgnum" |
58634dbf EW |
85 | } |
86 | ||
87 | call_merge () { | |
889a50e9 | 88 | cmt="$(cat "$dotest/cmt.$1")" |
58634dbf | 89 | echo "$cmt" > "$dotest/current" |
5be60078 | 90 | hd=$(git rev-parse --verify HEAD) |
6fd2f5e6 | 91 | cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) |
889a50e9 JS |
92 | msgnum=$(cat "$dotest/msgnum") |
93 | end=$(cat "$dotest/end") | |
0bb733c9 | 94 | eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' |
889a50e9 | 95 | eval GITHEAD_$hd='$(cat "$dotest/onto_name")' |
0bb733c9 SP |
96 | export GITHEAD_$cmt GITHEAD_$hd |
97 | git-merge-$strategy "$cmt^" -- "$hd" "$cmt" | |
58634dbf EW |
98 | rv=$? |
99 | case "$rv" in | |
100 | 0) | |
0bb733c9 | 101 | unset GITHEAD_$cmt GITHEAD_$hd |
9e4bc7dd | 102 | return |
58634dbf EW |
103 | ;; |
104 | 1) | |
b4372ef1 | 105 | git rerere |
66eb64cb | 106 | die "$RESOLVEMSG" |
58634dbf EW |
107 | ;; |
108 | 2) | |
109 | echo "Strategy: $rv $strategy failed, try another" 1>&2 | |
66eb64cb | 110 | die "$RESOLVEMSG" |
58634dbf EW |
111 | ;; |
112 | *) | |
113 | die "Unknown exit code ($rv) from command:" \ | |
114 | "git-merge-$strategy $cmt^ -- HEAD $cmt" | |
115 | ;; | |
116 | esac | |
117 | } | |
118 | ||
6fd2f5e6 JS |
119 | move_to_original_branch () { |
120 | test -z "$head_name" && | |
121 | head_name="$(cat "$dotest"/head-name)" && | |
122 | onto="$(cat "$dotest"/onto)" && | |
123 | orig_head="$(cat "$dotest"/orig-head)" | |
124 | case "$head_name" in | |
125 | refs/*) | |
126 | message="rebase finished: $head_name onto $onto" | |
127 | git update-ref -m "$message" \ | |
128 | $head_name $(git rev-parse HEAD) $orig_head && | |
129 | git symbolic-ref HEAD $head_name || | |
130 | die "Could not move back to $head_name" | |
131 | ;; | |
132 | esac | |
133 | } | |
134 | ||
58634dbf | 135 | finish_rb_merge () { |
6fd2f5e6 | 136 | move_to_original_branch |
58634dbf EW |
137 | rm -r "$dotest" |
138 | echo "All done." | |
139 | } | |
140 | ||
1b1dce4b | 141 | is_interactive () { |
f8cca019 AE |
142 | while test $# != 0 |
143 | do | |
144 | case "$1" in | |
145 | -i|--interactive) | |
146 | interactive_rebase=explicit | |
147 | break | |
148 | ;; | |
149 | -p|--preserve-merges) | |
150 | interactive_rebase=implied | |
151 | ;; | |
152 | esac | |
1b1dce4b | 153 | shift |
f8cca019 AE |
154 | done |
155 | ||
156 | if [ "$interactive_rebase" = implied ]; then | |
157 | GIT_EDITOR=: | |
158 | export GIT_EDITOR | |
159 | fi | |
160 | ||
161 | test -n "$interactive_rebase" || test -f "$dotest"/interactive | |
1b1dce4b JS |
162 | } |
163 | ||
d70b4a8f | 164 | run_pre_rebase_hook () { |
c4427656 NS |
165 | if test -z "$OK_TO_SKIP_PRE_REBASE" && |
166 | test -x "$GIT_DIR/hooks/pre-rebase" | |
d70b4a8f NS |
167 | then |
168 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { | |
169 | echo >&2 "The pre-rebase hook refused to rebase." | |
170 | exit 1 | |
171 | } | |
172 | fi | |
173 | } | |
174 | ||
9b752a6e SB |
175 | test -f "$GIT_DIR"/rebase-apply/applying && |
176 | die 'It looks like git-am is in progress. Cannot rebase.' | |
177 | ||
1b1dce4b JS |
178 | is_interactive "$@" && exec git-rebase--interactive "$@" |
179 | ||
9b752a6e SB |
180 | if test $# -eq 0 |
181 | then | |
182 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage | |
183 | test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing && | |
184 | die 'A rebase is in progress, try --continue, --skip or --abort.' | |
185 | die "No arguments given and $GIT_DIR/rebase-apply already exists." | |
186 | fi | |
187 | ||
822f7c73 | 188 | while test $# != 0 |
e646c9c8 JH |
189 | do |
190 | case "$1" in | |
c4427656 NS |
191 | --no-verify) |
192 | OK_TO_SKIP_PRE_REBASE=yes | |
193 | ;; | |
031321c6 | 194 | --continue) |
51ef1daa | 195 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
196 | die "No rebase in progress?" |
197 | ||
6848d58c | 198 | git diff-files --quiet --ignore-submodules || { |
06aff47b | 199 | echo "You must edit all merge conflicts and then" |
9b07873a | 200 | echo "mark them as resolved using git add" |
031321c6 | 201 | exit 1 |
06aff47b | 202 | } |
58634dbf EW |
203 | if test -d "$dotest" |
204 | then | |
889a50e9 JS |
205 | prev_head=$(cat "$dotest/prev_head") |
206 | end=$(cat "$dotest/end") | |
207 | msgnum=$(cat "$dotest/msgnum") | |
208 | onto=$(cat "$dotest/onto") | |
58634dbf EW |
209 | continue_merge |
210 | while test "$msgnum" -le "$end" | |
211 | do | |
212 | call_merge "$msgnum" | |
213 | continue_merge | |
214 | done | |
215 | finish_rb_merge | |
216 | exit | |
217 | fi | |
51ef1daa JS |
218 | head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) && |
219 | onto=$(cat "$GIT_DIR"/rebase-apply/onto) && | |
220 | orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) && | |
3f735b66 JS |
221 | git am --resolved --3way --resolvemsg="$RESOLVEMSG" && |
222 | move_to_original_branch | |
cc120056 SE |
223 | exit |
224 | ;; | |
225 | --skip) | |
51ef1daa | 226 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
227 | die "No rebase in progress?" |
228 | ||
fb6e4e1f | 229 | git reset --hard HEAD || exit $? |
58634dbf EW |
230 | if test -d "$dotest" |
231 | then | |
b4372ef1 | 232 | git rerere clear |
889a50e9 JS |
233 | prev_head=$(cat "$dotest/prev_head") |
234 | end=$(cat "$dotest/end") | |
235 | msgnum=$(cat "$dotest/msgnum") | |
d5e673b6 | 236 | msgnum=$(($msgnum + 1)) |
889a50e9 | 237 | onto=$(cat "$dotest/onto") |
d5e673b6 EW |
238 | while test "$msgnum" -le "$end" |
239 | do | |
240 | call_merge "$msgnum" | |
241 | continue_merge | |
242 | done | |
243 | finish_rb_merge | |
244 | exit | |
58634dbf | 245 | fi |
51ef1daa JS |
246 | head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) && |
247 | onto=$(cat "$GIT_DIR"/rebase-apply/onto) && | |
248 | orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) && | |
6fd2f5e6 JS |
249 | git am -3 --skip --resolvemsg="$RESOLVEMSG" && |
250 | move_to_original_branch | |
031321c6 SE |
251 | exit |
252 | ;; | |
253 | --abort) | |
51ef1daa | 254 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
255 | die "No rebase in progress?" |
256 | ||
b4372ef1 | 257 | git rerere clear |
58634dbf EW |
258 | if test -d "$dotest" |
259 | then | |
6fd2f5e6 | 260 | move_to_original_branch |
cd5320f2 | 261 | else |
51ef1daa | 262 | dotest="$GIT_DIR"/rebase-apply |
6fd2f5e6 | 263 | move_to_original_branch |
58634dbf | 264 | fi |
97b88dd5 | 265 | git reset --hard $(cat "$dotest/orig-head") |
48411d22 | 266 | rm -r "$dotest" |
031321c6 SE |
267 | exit |
268 | ;; | |
e646c9c8 JH |
269 | --onto) |
270 | test 2 -le "$#" || usage | |
271 | newbase="$2" | |
272 | shift | |
273 | ;; | |
58634dbf EW |
274 | -M|-m|--m|--me|--mer|--merg|--merge) |
275 | do_merge=t | |
276 | ;; | |
277 | -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ | |
278 | --strateg=*|--strategy=*|\ | |
279 | -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) | |
280 | case "$#,$1" in | |
281 | *,*=*) | |
8096fae7 | 282 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
58634dbf EW |
283 | 1,*) |
284 | usage ;; | |
285 | *) | |
286 | strategy="$2" | |
287 | shift ;; | |
288 | esac | |
289 | do_merge=t | |
290 | ;; | |
b758789c RS |
291 | -v|--verbose) |
292 | verbose=t | |
293 | ;; | |
059f446d BF |
294 | --whitespace=*) |
295 | git_am_opt="$git_am_opt $1" | |
296 | ;; | |
67dad687 | 297 | -C*) |
059f446d | 298 | git_am_opt="$git_am_opt $1" |
67dad687 | 299 | ;; |
e646c9c8 JH |
300 | -*) |
301 | usage | |
302 | ;; | |
303 | *) | |
304 | break | |
305 | ;; | |
306 | esac | |
307 | shift | |
308 | done | |
2db8aaec | 309 | |
51ef1daa | 310 | # Make sure we do not have $GIT_DIR/rebase-apply |
58634dbf | 311 | if test -z "$do_merge" |
7f4bd5d8 | 312 | then |
9b752a6e | 313 | if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null |
58634dbf | 314 | then |
51ef1daa | 315 | rmdir "$GIT_DIR"/rebase-apply |
58634dbf EW |
316 | else |
317 | echo >&2 ' | |
9b752a6e SB |
318 | It seems that I cannot create a rebase-apply directory, and |
319 | I wonder if you are in the middle of patch application or another | |
51ef1daa JS |
320 | rebase. If that is not the case, please |
321 | rm -fr '"$GIT_DIR"'/rebase-apply | |
9b752a6e | 322 | and run me again. I am stopping in case you still have something |
51ef1daa | 323 | valuable there.' |
58634dbf EW |
324 | exit 1 |
325 | fi | |
326 | else | |
327 | if test -d "$dotest" | |
328 | then | |
28ed6e7b | 329 | die "previous rebase directory $dotest still exists." \ |
9b752a6e | 330 | 'Try git rebase (--continue | --abort | --skip)' |
58634dbf | 331 | fi |
7f4bd5d8 JH |
332 | fi |
333 | ||
7f59dbbb | 334 | # The tree must be really really clean. |
07e62b73 JK |
335 | if ! git update-index --ignore-submodules --refresh; then |
336 | echo >&2 "cannot rebase: you have unstaged changes" | |
337 | exit 1 | |
338 | fi | |
6848d58c | 339 | diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) |
32d99544 | 340 | case "$diff" in |
07e62b73 JK |
341 | ?*) echo >&2 "cannot rebase: your index contains uncommitted changes" |
342 | echo >&2 "$diff" | |
7f59dbbb JH |
343 | exit 1 |
344 | ;; | |
345 | esac | |
99a92f92 | 346 | |
e646c9c8 JH |
347 | # The upstream head must be given. Make sure it is valid. |
348 | upstream_name="$1" | |
349 | upstream=`git rev-parse --verify "${upstream_name}^0"` || | |
d0080b3c | 350 | die "invalid upstream $upstream_name" |
32d99544 | 351 | |
a1bf91e0 JH |
352 | # Make sure the branch to rebase onto is valid. |
353 | onto_name=${newbase-"$upstream_name"} | |
5be60078 | 354 | onto=$(git rev-parse --verify "${onto_name}^0") || exit |
a1bf91e0 | 355 | |
9a111c91 | 356 | # If a hook exists, give it a chance to interrupt |
d70b4a8f | 357 | run_pre_rebase_hook ${1+"$@"} |
9a111c91 | 358 | |
0cb06644 JH |
359 | # If the branch to rebase is given, that is the branch we will rebase |
360 | # $branch_name -- branch being rebased, or HEAD (already detached) | |
361 | # $orig_head -- commit object name of tip of the branch before rebasing | |
362 | # $head_name -- refs/heads/<that-branch> or "detached HEAD" | |
363 | switch_to= | |
59e6b23a | 364 | case "$#" in |
7f59dbbb | 365 | 2) |
0cb06644 | 366 | # Is it "rebase other $branchname" or "rebase other $commit"? |
e646c9c8 | 367 | branch_name="$2" |
0cb06644 JH |
368 | switch_to="$2" |
369 | ||
370 | if git show-ref --verify --quiet -- "refs/heads/$2" && | |
5a92d190 | 371 | branch=$(git rev-parse -q --verify "refs/heads/$2") |
0cb06644 JH |
372 | then |
373 | head_name="refs/heads/$2" | |
5a92d190 | 374 | elif branch=$(git rev-parse -q --verify "$2") |
0cb06644 JH |
375 | then |
376 | head_name="detached HEAD" | |
377 | else | |
378 | usage | |
379 | fi | |
e646c9c8 JH |
380 | ;; |
381 | *) | |
0cb06644 | 382 | # Do not need to switch branches, we are already on it. |
bcf31618 JH |
383 | if branch_name=`git symbolic-ref -q HEAD` |
384 | then | |
0cb06644 | 385 | head_name=$branch_name |
bcf31618 JH |
386 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` |
387 | else | |
0cb06644 | 388 | head_name="detached HEAD" |
bcf31618 JH |
389 | branch_name=HEAD ;# detached |
390 | fi | |
0cb06644 | 391 | branch=$(git rev-parse --verify "${branch_name}^0") || exit |
e646c9c8 | 392 | ;; |
59e6b23a | 393 | esac |
0cb06644 | 394 | orig_head=$branch |
59e6b23a | 395 | |
e646c9c8 JH |
396 | # Now we are rebasing commits $upstream..$branch on top of $onto |
397 | ||
1308c17b JS |
398 | # Check if we are already based on $onto with linear history, |
399 | # but this should be done only when upstream and onto are the same. | |
5be60078 | 400 | mb=$(git merge-base "$onto" "$branch") |
1308c17b JS |
401 | if test "$upstream" = "$onto" && test "$mb" = "$onto" && |
402 | # linear history? | |
bbf08124 | 403 | ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null |
7f4bd5d8 | 404 | then |
0cb06644 JH |
405 | # Lazily switch to the target branch if needed... |
406 | test -z "$switch_to" || git checkout "$switch_to" | |
83c31614 RS |
407 | echo >&2 "Current branch $branch_name is up to date." |
408 | exit 0 | |
7f4bd5d8 JH |
409 | fi |
410 | ||
b758789c RS |
411 | if test -n "$verbose" |
412 | then | |
413 | echo "Changes from $mb to $onto:" | |
fefe49d1 | 414 | # We want color (if set), but no pager |
5be60078 | 415 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" |
b758789c RS |
416 | fi |
417 | ||
0cb06644 | 418 | # Detach HEAD and reset the tree |
228e2eb6 | 419 | echo "First, rewinding head to replay your work on top of it..." |
324c2c31 | 420 | git checkout -q "$onto^0" || die "could not detach HEAD" |
22e40795 | 421 | git update-ref ORIG_HEAD $branch |
32d99544 | 422 | |
e646c9c8 | 423 | # If the $onto is a proper descendant of the tip of the branch, then |
32d99544 | 424 | # we just fast forwarded. |
83c31614 | 425 | if test "$mb" = "$branch" |
32d99544 | 426 | then |
d587ed13 | 427 | echo >&2 "Fast-forwarded $branch_name to $onto_name." |
6fd2f5e6 | 428 | move_to_original_branch |
32d99544 LS |
429 | exit 0 |
430 | fi | |
431 | ||
58634dbf EW |
432 | if test -z "$do_merge" |
433 | then | |
0cb06644 JH |
434 | git format-patch -k --stdout --full-index --ignore-if-in-upstream \ |
435 | "$upstream..$orig_head" | | |
3041c324 | 436 | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && |
6fd2f5e6 JS |
437 | move_to_original_branch |
438 | ret=$? | |
51ef1daa JS |
439 | test 0 != $ret -a -d "$GIT_DIR"/rebase-apply && |
440 | echo $head_name > "$GIT_DIR"/rebase-apply/head-name && | |
441 | echo $onto > "$GIT_DIR"/rebase-apply/onto && | |
442 | echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head | |
6fd2f5e6 | 443 | exit $ret |
58634dbf EW |
444 | fi |
445 | ||
446 | # start doing a rebase with git-merge | |
447 | # this is rename-aware if the recursive (default) strategy is used | |
448 | ||
449 | mkdir -p "$dotest" | |
450 | echo "$onto" > "$dotest/onto" | |
0bb733c9 | 451 | echo "$onto_name" > "$dotest/onto_name" |
6fd2f5e6 | 452 | prev_head=$orig_head |
58634dbf | 453 | echo "$prev_head" > "$dotest/prev_head" |
6fd2f5e6 JS |
454 | echo "$orig_head" > "$dotest/orig-head" |
455 | echo "$head_name" > "$dotest/head-name" | |
58634dbf EW |
456 | |
457 | msgnum=0 | |
0cb06644 | 458 | for cmt in `git rev-list --reverse --no-merges "$upstream..$orig_head"` |
58634dbf EW |
459 | do |
460 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 461 | echo "$cmt" > "$dotest/cmt.$msgnum" |
58634dbf EW |
462 | done |
463 | ||
5887ac82 JH |
464 | echo 1 >"$dotest/msgnum" |
465 | echo $msgnum >"$dotest/end" | |
58634dbf EW |
466 | |
467 | end=$msgnum | |
468 | msgnum=1 | |
469 | ||
470 | while test "$msgnum" -le "$end" | |
471 | do | |
472 | call_merge "$msgnum" | |
473 | continue_merge | |
474 | done | |
cc120056 | 475 | |
58634dbf | 476 | finish_rb_merge |