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