]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
c2145384 LK |
6 | USAGE='[--interactive | -i] [--exec | -x <cmd>] [-v] [--force-rebase | -f] |
7 | [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]' | |
031321c6 SE |
8 | LONG_USAGE='git-rebase replaces <branch> with a new branch of the |
9 | same name. When the --onto option is provided the new branch starts | |
10 | out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> | |
11 | It then attempts to create a new commit for each commit from the original | |
12 | <branch> that does not exist in the <upstream> branch. | |
69a60af5 | 13 | |
031321c6 SE |
14 | It is possible that a merge failure will prevent this process from being |
15 | completely automatic. You will have to resolve any such merge failure | |
cc120056 | 16 | and run git rebase --continue. Another option is to bypass the commit |
5960bc9d | 17 | that caused the merge failure with git rebase --skip. To check out the |
51ef1daa JS |
18 | original <branch> and remove the .git/rebase-apply working files, use the |
19 | command git rebase --abort instead. | |
69a60af5 | 20 | |
031321c6 | 21 | Note that if <branch> is not specified on the command line, the |
702088af | 22 | currently checked out branch is used. |
e646c9c8 | 23 | |
031321c6 | 24 | Example: git-rebase master~1 topic |
e646c9c8 | 25 | |
285c6cbf | 26 | A---B---C topic A'\''--B'\''--C'\'' topic |
031321c6 SE |
27 | / --> / |
28 | D---E---F---G master D---E---F---G master | |
e646c9c8 | 29 | ' |
533b7039 JH |
30 | |
31 | SUBDIRECTORY_OK=Yes | |
45e2acf3 MZ |
32 | OPTIONS_KEEPDASHDASH= |
33 | OPTIONS_SPEC="\ | |
c2145384 | 34 | git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] |
0cd993a7 | 35 | git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] |
45e2acf3 MZ |
36 | git-rebase [-i] --continue | --abort | --skip |
37 | -- | |
38 | Available options are | |
39 | v,verbose! display a diffstat of what changed upstream | |
40 | q,quiet! be quiet. implies --no-stat | |
41 | onto=! rebase onto given branch instead of upstream | |
42 | p,preserve-merges! try to recreate merges instead of ignoring them | |
43 | s,strategy=! use the given merge strategy | |
44 | no-ff! cherry-pick all commits, even if unchanged | |
45 | m,merge! use merging strategies to rebase | |
46 | i,interactive! let the user edit the list of commits to rebase | |
c2145384 | 47 | x,exec=! add exec lines after each commit of the editable list |
90e1818f | 48 | k,keep-empty preserve empty commits during rebase |
45e2acf3 MZ |
49 | f,force-rebase! force rebase even if branch is up to date |
50 | X,strategy-option=! pass the argument through to the merge strategy | |
51 | stat! display a diffstat of what changed upstream | |
52 | n,no-stat! do not show diffstat of what changed upstream | |
53 | verify allow pre-rebase hook to run | |
54 | rerere-autoupdate allow rerere to update index with resolved conflicts | |
55 | root! rebase all reachable commits up to the root(s) | |
56 | autosquash move commits that begin with squash!/fixup! under -i | |
57 | committer-date-is-author-date! passed to 'git am' | |
58 | ignore-date! passed to 'git am' | |
59 | whitespace=! passed to 'git apply' | |
60 | ignore-whitespace! passed to 'git apply' | |
61 | C=! passed to 'git apply' | |
62 | Actions: | |
5960bc9d MZ |
63 | continue! continue |
64 | abort! abort and check out the original branch | |
65 | skip! skip current patch and continue | |
45e2acf3 | 66 | " |
ae2b0f15 | 67 | . git-sh-setup |
f9474132 | 68 | set_reflog_action rebase |
035b5bf6 | 69 | require_work_tree_exists |
533b7039 | 70 | cd_to_toplevel |
4282c4fb | 71 | |
61dfa1bb JH |
72 | LF=' |
73 | ' | |
6bb4e485 MZ |
74 | ok_to_skip_pre_rebase= |
75 | resolvemsg=" | |
cc120056 SE |
76 | When you have resolved this problem run \"git rebase --continue\". |
77 | If you would prefer to skip this patch, instead run \"git rebase --skip\". | |
5960bc9d | 78 | To check out the original branch and stop rebasing run \"git rebase --abort\". |
cc120056 | 79 | " |
6bb4e485 | 80 | unset onto |
c2145384 | 81 | cmd= |
9765b6ab | 82 | strategy= |
93ce190c | 83 | strategy_opts= |
58634dbf | 84 | do_merge= |
69a636ad MZ |
85 | merge_dir="$GIT_DIR"/rebase-merge |
86 | apply_dir="$GIT_DIR"/rebase-apply | |
b758789c | 87 | verbose= |
9474a029 MZ |
88 | diffstat= |
89 | test "$(git config --bool rebase.stat)" = true && diffstat=t | |
67dad687 | 90 | git_am_opt= |
190f5323 | 91 | rebase_root= |
b2f82e05 | 92 | force_rebase= |
cb6020bb | 93 | allow_rerere_autoupdate= |
99de0640 MZ |
94 | # Non-empty if a rebase was in progress when 'git rebase' was invoked |
95 | in_progress= | |
96 | # One of {am, merge, interactive} | |
97 | type= | |
98 | # One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge} | |
99 | state_dir= | |
34262322 MZ |
100 | # One of {'', continue, skip, abort}, as parsed from command line |
101 | action= | |
cf432ca0 MZ |
102 | preserve_merges= |
103 | autosquash= | |
90e1818f | 104 | keep_empty= |
cf432ca0 | 105 | test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t |
58634dbf | 106 | |
fa99c1e1 | 107 | read_basic_state () { |
02ac45fa MZ |
108 | head_name=$(cat "$state_dir"/head-name) && |
109 | onto=$(cat "$state_dir"/onto) && | |
84df4560 MZ |
110 | # We always write to orig-head, but interactive rebase used to write to |
111 | # head. Fall back to reading from head to cover for the case that the | |
112 | # user upgraded git with an ongoing interactive rebase. | |
113 | if test -f "$state_dir"/orig-head | |
2959c283 | 114 | then |
2959c283 | 115 | orig_head=$(cat "$state_dir"/orig-head) |
84df4560 MZ |
116 | else |
117 | orig_head=$(cat "$state_dir"/head) | |
2959c283 | 118 | fi && |
7b37a7c6 MZ |
119 | GIT_QUIET=$(cat "$state_dir"/quiet) && |
120 | test -f "$state_dir"/verbose && verbose=t | |
80ff4795 MZ |
121 | test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" |
122 | test -f "$state_dir"/strategy_opts && | |
123 | strategy_opts="$(cat "$state_dir"/strategy_opts)" | |
b3e4847e MZ |
124 | test -f "$state_dir"/allow_rerere_autoupdate && |
125 | allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)" | |
02ac45fa MZ |
126 | } |
127 | ||
84df4560 MZ |
128 | write_basic_state () { |
129 | echo "$head_name" > "$state_dir"/head-name && | |
130 | echo "$onto" > "$state_dir"/onto && | |
131 | echo "$orig_head" > "$state_dir"/orig-head && | |
7b37a7c6 MZ |
132 | echo "$GIT_QUIET" > "$state_dir"/quiet && |
133 | test t = "$verbose" && : > "$state_dir"/verbose | |
80ff4795 MZ |
134 | test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy |
135 | test -n "$strategy_opts" && echo "$strategy_opts" > \ | |
136 | "$state_dir"/strategy_opts | |
b3e4847e MZ |
137 | test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \ |
138 | "$state_dir"/allow_rerere_autoupdate | |
84df4560 MZ |
139 | } |
140 | ||
4974c2ca MZ |
141 | output () { |
142 | case "$verbose" in | |
143 | '') | |
144 | output=$("$@" 2>&1 ) | |
145 | status=$? | |
146 | test $status != 0 && printf "%s\n" "$output" | |
147 | return $status | |
148 | ;; | |
149 | *) | |
150 | "$@" | |
151 | ;; | |
152 | esac | |
153 | } | |
154 | ||
6fd2f5e6 | 155 | move_to_original_branch () { |
6fd2f5e6 JS |
156 | case "$head_name" in |
157 | refs/*) | |
158 | message="rebase finished: $head_name onto $onto" | |
159 | git update-ref -m "$message" \ | |
160 | $head_name $(git rev-parse HEAD) $orig_head && | |
53f2ffa8 JK |
161 | git symbolic-ref \ |
162 | -m "rebase finished: returning to $head_name" \ | |
163 | HEAD $head_name || | |
6fd2f5e6 JS |
164 | die "Could not move back to $head_name" |
165 | ;; | |
166 | esac | |
167 | } | |
168 | ||
fa99c1e1 | 169 | run_specific_rebase () { |
f8cca019 AE |
170 | if [ "$interactive_rebase" = implied ]; then |
171 | GIT_EDITOR=: | |
172 | export GIT_EDITOR | |
8a6dae10 | 173 | autosquash= |
f8cca019 | 174 | fi |
46df82d5 | 175 | . git-rebase--$type |
1b1dce4b JS |
176 | } |
177 | ||
d70b4a8f | 178 | run_pre_rebase_hook () { |
6bb4e485 | 179 | if test -z "$ok_to_skip_pre_rebase" && |
c4427656 | 180 | test -x "$GIT_DIR/hooks/pre-rebase" |
d70b4a8f | 181 | then |
bc2bbc45 SB |
182 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || |
183 | die "The pre-rebase hook refused to rebase." | |
d70b4a8f NS |
184 | fi |
185 | } | |
186 | ||
69a636ad | 187 | test -f "$apply_dir"/applying && |
9b752a6e SB |
188 | die 'It looks like git-am is in progress. Cannot rebase.' |
189 | ||
99de0640 MZ |
190 | if test -d "$apply_dir" |
191 | then | |
192 | type=am | |
193 | state_dir="$apply_dir" | |
194 | elif test -d "$merge_dir" | |
195 | then | |
196 | if test -f "$merge_dir"/interactive | |
197 | then | |
198 | type=interactive | |
199 | interactive_rebase=explicit | |
200 | else | |
201 | type=merge | |
202 | fi | |
203 | state_dir="$merge_dir" | |
204 | fi | |
205 | test -n "$type" && in_progress=t | |
206 | ||
95135b06 | 207 | total_argc=$# |
822f7c73 | 208 | while test $# != 0 |
e646c9c8 JH |
209 | do |
210 | case "$1" in | |
c4427656 | 211 | --no-verify) |
6bb4e485 | 212 | ok_to_skip_pre_rebase=yes |
c4427656 | 213 | ;; |
7baf9c4b | 214 | --verify) |
6bb4e485 | 215 | ok_to_skip_pre_rebase= |
7baf9c4b | 216 | ;; |
34262322 | 217 | --continue|--skip|--abort) |
45e2acf3 | 218 | test $total_argc -eq 2 || usage |
34262322 | 219 | action=${1##--} |
031321c6 | 220 | ;; |
e646c9c8 JH |
221 | --onto) |
222 | test 2 -le "$#" || usage | |
6bb4e485 | 223 | onto="$2" |
e646c9c8 JH |
224 | shift |
225 | ;; | |
c2145384 LK |
226 | -x) |
227 | test 2 -le "$#" || usage | |
228 | cmd="${cmd}exec $2${LF}" | |
229 | shift | |
230 | ;; | |
45e2acf3 | 231 | -i) |
cf432ca0 MZ |
232 | interactive_rebase=explicit |
233 | ;; | |
90e1818f NH |
234 | -k) |
235 | keep_empty=yes | |
236 | ;; | |
45e2acf3 | 237 | -p) |
cf432ca0 MZ |
238 | preserve_merges=t |
239 | test -z "$interactive_rebase" && interactive_rebase=implied | |
240 | ;; | |
241 | --autosquash) | |
242 | autosquash=t | |
243 | ;; | |
244 | --no-autosquash) | |
245 | autosquash= | |
246 | ;; | |
45e2acf3 | 247 | -M|-m) |
58634dbf EW |
248 | do_merge=t |
249 | ;; | |
45e2acf3 MZ |
250 | -X) |
251 | shift | |
252 | strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$1")" | |
93ce190c | 253 | do_merge=t |
9765b6ab | 254 | test -z "$strategy" && strategy=recursive |
93ce190c | 255 | ;; |
45e2acf3 MZ |
256 | -s) |
257 | shift | |
258 | strategy="$1" | |
58634dbf EW |
259 | do_merge=t |
260 | ;; | |
45e2acf3 | 261 | -n) |
a9c3821c TAV |
262 | diffstat= |
263 | ;; | |
264 | --stat) | |
265 | diffstat=t | |
266 | ;; | |
45e2acf3 | 267 | -v) |
b758789c | 268 | verbose=t |
a9c3821c | 269 | diffstat=t |
0e987a12 SB |
270 | GIT_QUIET= |
271 | ;; | |
45e2acf3 | 272 | -q) |
0e987a12 SB |
273 | GIT_QUIET=t |
274 | git_am_opt="$git_am_opt -q" | |
275 | verbose= | |
276 | diffstat= | |
b758789c | 277 | ;; |
45e2acf3 MZ |
278 | --whitespace) |
279 | shift | |
280 | git_am_opt="$git_am_opt --whitespace=$1" | |
b2f82e05 | 281 | case "$1" in |
45e2acf3 | 282 | fix|strip) |
b2f82e05 SR |
283 | force_rebase=t |
284 | ;; | |
285 | esac | |
059f446d | 286 | ;; |
86c91f91 GB |
287 | --ignore-whitespace) |
288 | git_am_opt="$git_am_opt $1" | |
289 | ;; | |
570ccad3 MB |
290 | --committer-date-is-author-date|--ignore-date) |
291 | git_am_opt="$git_am_opt $1" | |
292 | force_rebase=t | |
293 | ;; | |
45e2acf3 MZ |
294 | -C) |
295 | shift | |
296 | git_am_opt="$git_am_opt -C$1" | |
67dad687 | 297 | ;; |
190f5323 TR |
298 | --root) |
299 | rebase_root=t | |
300 | ;; | |
45e2acf3 | 301 | -f|--no-ff) |
b2f82e05 SR |
302 | force_rebase=t |
303 | ;; | |
cb6020bb JH |
304 | --rerere-autoupdate|--no-rerere-autoupdate) |
305 | allow_rerere_autoupdate="$1" | |
306 | ;; | |
45e2acf3 MZ |
307 | --) |
308 | shift | |
e646c9c8 JH |
309 | break |
310 | ;; | |
311 | esac | |
312 | shift | |
313 | done | |
51b2ead0 | 314 | test $# -gt 2 && usage |
2db8aaec | 315 | |
c2145384 LK |
316 | if test -n "$cmd" && |
317 | test "$interactive_rebase" != explicit | |
318 | then | |
319 | die "--exec option must be used with --interactive option" | |
320 | fi | |
321 | ||
cf432ca0 MZ |
322 | if test -n "$action" |
323 | then | |
324 | test -z "$in_progress" && die "No rebase in progress?" | |
2959c283 MZ |
325 | # Only interactive rebase uses detailed reflog messages |
326 | if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase | |
327 | then | |
328 | GIT_REFLOG_ACTION="rebase -i ($action)" | |
329 | export GIT_REFLOG_ACTION | |
330 | fi | |
cf432ca0 | 331 | fi |
34262322 MZ |
332 | |
333 | case "$action" in | |
334 | continue) | |
2959c283 MZ |
335 | # Sanity check |
336 | git rev-parse --verify HEAD >/dev/null || | |
337 | die "Cannot read HEAD" | |
34262322 MZ |
338 | git update-index --ignore-submodules --refresh && |
339 | git diff-files --quiet --ignore-submodules || { | |
340 | echo "You must edit all merge conflicts and then" | |
341 | echo "mark them as resolved using git add" | |
342 | exit 1 | |
343 | } | |
fa99c1e1 MZ |
344 | read_basic_state |
345 | run_specific_rebase | |
34262322 MZ |
346 | ;; |
347 | skip) | |
4974c2ca | 348 | output git reset --hard HEAD || exit $? |
fa99c1e1 MZ |
349 | read_basic_state |
350 | run_specific_rebase | |
34262322 MZ |
351 | ;; |
352 | abort) | |
353 | git rerere clear | |
fa99c1e1 | 354 | read_basic_state |
34262322 MZ |
355 | case "$head_name" in |
356 | refs/*) | |
ea69619c | 357 | git symbolic-ref -m "rebase: aborting" HEAD $head_name || |
34262322 MZ |
358 | die "Could not move back to $head_name" |
359 | ;; | |
360 | esac | |
4974c2ca | 361 | output git reset --hard $orig_head |
34262322 MZ |
362 | rm -r "$state_dir" |
363 | exit | |
364 | ;; | |
365 | esac | |
366 | ||
99de0640 MZ |
367 | # Make sure no rebase is in progress |
368 | if test -n "$in_progress" | |
7f4bd5d8 | 369 | then |
99de0640 MZ |
370 | die ' |
371 | It seems that there is already a '"${state_dir##*/}"' directory, and | |
372 | I wonder if you are in the middle of another rebase. If that is the | |
373 | case, please try | |
374 | git rebase (--continue | --abort | --skip) | |
375 | If that is not the case, please | |
376 | rm -fr '"$state_dir"' | |
9b752a6e | 377 | and run me again. I am stopping in case you still have something |
51ef1daa | 378 | valuable there.' |
7f4bd5d8 JH |
379 | fi |
380 | ||
df5df20c CW |
381 | if test -n "$rebase_root" && test -z "$onto" |
382 | then | |
383 | test -z "$interactive_rebase" && interactive_rebase=implied | |
384 | fi | |
385 | ||
cf432ca0 MZ |
386 | if test -n "$interactive_rebase" |
387 | then | |
388 | type=interactive | |
389 | state_dir="$merge_dir" | |
390 | elif test -n "$do_merge" | |
391 | then | |
392 | type=merge | |
393 | state_dir="$merge_dir" | |
394 | else | |
395 | type=am | |
396 | state_dir="$apply_dir" | |
397 | fi | |
398 | ||
190f5323 TR |
399 | if test -z "$rebase_root" |
400 | then | |
15a147e6 MZ |
401 | case "$#" in |
402 | 0) | |
403 | if ! upstream_name=$(git rev-parse --symbolic-full-name \ | |
404 | --verify -q @{upstream} 2>/dev/null) | |
405 | then | |
406 | . git-parse-remote | |
407 | error_on_missing_default_upstream "rebase" "rebase" \ | |
3c02396a | 408 | "against" "git rebase <branch>" |
15a147e6 MZ |
409 | fi |
410 | ;; | |
411 | *) upstream_name="$1" | |
412 | shift | |
413 | ;; | |
414 | esac | |
190f5323 TR |
415 | upstream=`git rev-parse --verify "${upstream_name}^0"` || |
416 | die "invalid upstream $upstream_name" | |
190f5323 TR |
417 | upstream_arg="$upstream_name" |
418 | else | |
df5df20c CW |
419 | if test -z "$onto" |
420 | then | |
421 | empty_tree=`git hash-object -t tree /dev/null` | |
422 | onto=`git commit-tree $empty_tree </dev/null` | |
423 | squash_onto="$onto" | |
424 | fi | |
190f5323 TR |
425 | unset upstream_name |
426 | unset upstream | |
f2b6a199 | 427 | test $# -gt 1 && usage |
46df82d5 | 428 | upstream_arg=--root |
190f5323 | 429 | fi |
32d99544 | 430 | |
a1bf91e0 | 431 | # Make sure the branch to rebase onto is valid. |
6bb4e485 | 432 | onto_name=${onto-"$upstream_name"} |
9f21e97d NS |
433 | case "$onto_name" in |
434 | *...*) | |
435 | if left=${onto_name%...*} right=${onto_name#*...} && | |
436 | onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD}) | |
437 | then | |
438 | case "$onto" in | |
439 | ?*"$LF"?*) | |
440 | die "$onto_name: there are more than one merge bases" | |
441 | ;; | |
442 | '') | |
443 | die "$onto_name: there is no merge base" | |
444 | ;; | |
445 | esac | |
446 | else | |
61dfa1bb | 447 | die "$onto_name: there is no merge base" |
9f21e97d NS |
448 | fi |
449 | ;; | |
450 | *) | |
71786f54 | 451 | onto=$(git rev-parse --verify "${onto_name}^0") || |
9180feaf | 452 | die "Does not point to a valid commit: $onto_name" |
9f21e97d NS |
453 | ;; |
454 | esac | |
a1bf91e0 | 455 | |
0cb06644 JH |
456 | # If the branch to rebase is given, that is the branch we will rebase |
457 | # $branch_name -- branch being rebased, or HEAD (already detached) | |
458 | # $orig_head -- commit object name of tip of the branch before rebasing | |
459 | # $head_name -- refs/heads/<that-branch> or "detached HEAD" | |
460 | switch_to= | |
59e6b23a | 461 | case "$#" in |
190f5323 | 462 | 1) |
0cb06644 | 463 | # Is it "rebase other $branchname" or "rebase other $commit"? |
190f5323 TR |
464 | branch_name="$1" |
465 | switch_to="$1" | |
0cb06644 | 466 | |
190f5323 | 467 | if git show-ref --verify --quiet -- "refs/heads/$1" && |
cb82a05d | 468 | orig_head=$(git rev-parse -q --verify "refs/heads/$1") |
0cb06644 | 469 | then |
190f5323 | 470 | head_name="refs/heads/$1" |
cb82a05d | 471 | elif orig_head=$(git rev-parse -q --verify "$1") |
0cb06644 JH |
472 | then |
473 | head_name="detached HEAD" | |
474 | else | |
34840db8 | 475 | die "fatal: no such branch: $1" |
0cb06644 | 476 | fi |
e646c9c8 | 477 | ;; |
f2b6a199 | 478 | 0) |
0cb06644 | 479 | # Do not need to switch branches, we are already on it. |
bcf31618 JH |
480 | if branch_name=`git symbolic-ref -q HEAD` |
481 | then | |
0cb06644 | 482 | head_name=$branch_name |
bcf31618 JH |
483 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` |
484 | else | |
0cb06644 | 485 | head_name="detached HEAD" |
bcf31618 JH |
486 | branch_name=HEAD ;# detached |
487 | fi | |
cb82a05d | 488 | orig_head=$(git rev-parse --verify "${branch_name}^0") || exit |
e646c9c8 | 489 | ;; |
f2b6a199 MZ |
490 | *) |
491 | die "BUG: unexpected number of arguments left to parse" | |
492 | ;; | |
59e6b23a JH |
493 | esac |
494 | ||
8f9bfb64 MZ |
495 | require_clean_work_tree "rebase" "Please commit or stash them." |
496 | ||
cb82a05d MZ |
497 | # Now we are rebasing commits $upstream..$orig_head (or with --root, |
498 | # everything leading up to $orig_head) on top of $onto | |
e646c9c8 | 499 | |
1308c17b | 500 | # Check if we are already based on $onto with linear history, |
cc1453e1 MZ |
501 | # but this should be done only when upstream and onto are the same |
502 | # and if this is not an interactive rebase. | |
cb82a05d | 503 | mb=$(git merge-base "$onto" "$orig_head") |
cc1453e1 MZ |
504 | if test "$type" != interactive && test "$upstream" = "$onto" && |
505 | test "$mb" = "$onto" && | |
1308c17b | 506 | # linear history? |
cb82a05d | 507 | ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null |
7f4bd5d8 | 508 | then |
b2f82e05 SR |
509 | if test -z "$force_rebase" |
510 | then | |
511 | # Lazily switch to the target branch if needed... | |
3b21a438 | 512 | test -z "$switch_to" || git checkout "$switch_to" -- |
0e987a12 | 513 | say "Current branch $branch_name is up to date." |
b2f82e05 SR |
514 | exit 0 |
515 | else | |
0e987a12 | 516 | say "Current branch $branch_name is up to date, rebase forced." |
b2f82e05 | 517 | fi |
7f4bd5d8 JH |
518 | fi |
519 | ||
8f9bfb64 MZ |
520 | # If a hook exists, give it a chance to interrupt |
521 | run_pre_rebase_hook "$upstream_arg" "$@" | |
522 | ||
a9c3821c TAV |
523 | if test -n "$diffstat" |
524 | then | |
525 | if test -n "$verbose" | |
526 | then | |
527 | echo "Changes from $mb to $onto:" | |
528 | fi | |
529 | # We want color (if set), but no pager | |
530 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" | |
531 | fi | |
532 | ||
fa99c1e1 | 533 | test "$type" = interactive && run_specific_rebase |
f4107d9c MZ |
534 | |
535 | # Detach HEAD and reset the tree | |
536 | say "First, rewinding head to replay your work on top of it..." | |
537 | git checkout -q "$onto^0" || die "could not detach HEAD" | |
cb82a05d | 538 | git update-ref ORIG_HEAD $orig_head |
f4107d9c | 539 | |
e646c9c8 | 540 | # If the $onto is a proper descendant of the tip of the branch, then |
a75d7b54 | 541 | # we just fast-forwarded. |
cb82a05d | 542 | if test "$mb" = "$orig_head" |
32d99544 | 543 | then |
0e987a12 | 544 | say "Fast-forwarded $branch_name to $onto_name." |
6fd2f5e6 | 545 | move_to_original_branch |
32d99544 LS |
546 | exit 0 |
547 | fi | |
548 | ||
190f5323 TR |
549 | if test -n "$rebase_root" |
550 | then | |
551 | revisions="$onto..$orig_head" | |
552 | else | |
553 | revisions="$upstream..$orig_head" | |
554 | fi | |
555 | ||
fa99c1e1 | 556 | run_specific_rebase |