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