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