]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
533b7039 | 6 | SUBDIRECTORY_OK=Yes |
45e2acf3 | 7 | OPTIONS_KEEPDASHDASH= |
b6e9e73e | 8 | OPTIONS_STUCKLONG=t |
45e2acf3 | 9 | OPTIONS_SPEC="\ |
c2145384 | 10 | git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] |
0cd993a7 | 11 | git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] |
82cb775c | 12 | git rebase --continue | --abort | --skip | --edit-todo |
45e2acf3 MZ |
13 | -- |
14 | Available options are | |
15 | v,verbose! display a diffstat of what changed upstream | |
16 | q,quiet! be quiet. implies --no-stat | |
619e3604 | 17 | autostash automatically stash/stash pop before and after |
ad8261d2 | 18 | fork-point use 'merge-base --fork-point' to refine upstream |
45e2acf3 | 19 | onto=! rebase onto given branch instead of upstream |
7543f6f4 | 20 | r,rebase-merges? try to rebase merges instead of skipping them |
45e2acf3 MZ |
21 | p,preserve-merges! try to recreate merges instead of ignoring them |
22 | s,strategy=! use the given merge strategy | |
d4e80629 | 23 | X,strategy-option=! pass the argument through to the merge strategy |
45e2acf3 | 24 | no-ff! cherry-pick all commits, even if unchanged |
d4e80629 | 25 | f,force-rebase! cherry-pick all commits, even if unchanged |
45e2acf3 MZ |
26 | m,merge! use merging strategies to rebase |
27 | i,interactive! let the user edit the list of commits to rebase | |
c2145384 | 28 | x,exec=! add exec lines after each commit of the editable list |
90e1818f | 29 | k,keep-empty preserve empty commits during rebase |
a6c612b5 | 30 | allow-empty-message allow rebasing commits with empty messages |
45e2acf3 MZ |
31 | stat! display a diffstat of what changed upstream |
32 | n,no-stat! do not show diffstat of what changed upstream | |
33 | verify allow pre-rebase hook to run | |
34 | rerere-autoupdate allow rerere to update index with resolved conflicts | |
35 | root! rebase all reachable commits up to the root(s) | |
36 | autosquash move commits that begin with squash!/fixup! under -i | |
d4e80629 | 37 | signoff add a Signed-off-by: line to each commit |
45e2acf3 MZ |
38 | committer-date-is-author-date! passed to 'git am' |
39 | ignore-date! passed to 'git am' | |
40 | whitespace=! passed to 'git apply' | |
41 | ignore-whitespace! passed to 'git apply' | |
42 | C=! passed to 'git apply' | |
3ee5e540 | 43 | S,gpg-sign? GPG-sign commits |
45e2acf3 | 44 | Actions: |
5960bc9d MZ |
45 | continue! continue |
46 | abort! abort and check out the original branch | |
47 | skip! skip current patch and continue | |
eb9a7cb4 | 48 | edit-todo! edit the todo list during an interactive rebase |
9512177b | 49 | quit! abort but keep HEAD where it is |
66335298 | 50 | show-current-patch! show the patch file being applied or merged |
45e2acf3 | 51 | " |
ae2b0f15 | 52 | . git-sh-setup |
f9474132 | 53 | set_reflog_action rebase |
035b5bf6 | 54 | require_work_tree_exists |
533b7039 | 55 | cd_to_toplevel |
4282c4fb | 56 | |
61dfa1bb JH |
57 | LF=' |
58 | ' | |
6bb4e485 | 59 | ok_to_skip_pre_rebase= |
c7b64aa0 | 60 | |
bb2ac4fc | 61 | squash_onto= |
6bb4e485 | 62 | unset onto |
1e0dacdb | 63 | unset restrict_revision |
c2145384 | 64 | cmd= |
9765b6ab | 65 | strategy= |
93ce190c | 66 | strategy_opts= |
58634dbf | 67 | do_merge= |
69a636ad MZ |
68 | merge_dir="$GIT_DIR"/rebase-merge |
69 | apply_dir="$GIT_DIR"/rebase-apply | |
b758789c | 70 | verbose= |
9474a029 MZ |
71 | diffstat= |
72 | test "$(git config --bool rebase.stat)" = true && diffstat=t | |
58794775 | 73 | autostash="$(git config --bool rebase.autostash || echo false)" |
ad8261d2 | 74 | fork_point=auto |
67dad687 | 75 | git_am_opt= |
9eaa858e | 76 | git_format_patch_opt= |
190f5323 | 77 | rebase_root= |
b2f82e05 | 78 | force_rebase= |
cb6020bb | 79 | allow_rerere_autoupdate= |
99de0640 MZ |
80 | # Non-empty if a rebase was in progress when 'git rebase' was invoked |
81 | in_progress= | |
82 | # One of {am, merge, interactive} | |
83 | type= | |
84 | # One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge} | |
85 | state_dir= | |
34262322 MZ |
86 | # One of {'', continue, skip, abort}, as parsed from command line |
87 | action= | |
8f6aed71 | 88 | rebase_merges= |
7543f6f4 | 89 | rebase_cousins= |
cf432ca0 MZ |
90 | preserve_merges= |
91 | autosquash= | |
90e1818f | 92 | keep_empty= |
b00bf1c9 | 93 | allow_empty_message=--allow-empty-message |
a852ec7f | 94 | signoff= |
cf432ca0 | 95 | test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t |
66948561 JH |
96 | case "$(git config --bool commit.gpgsign)" in |
97 | true) gpg_sign_opt=-S ;; | |
98 | *) gpg_sign_opt= ;; | |
99 | esac | |
c7b64aa0 | 100 | . git-rebase--common |
58634dbf | 101 | |
fa99c1e1 | 102 | read_basic_state () { |
dc8ca912 RR |
103 | test -f "$state_dir/head-name" && |
104 | test -f "$state_dir/onto" && | |
02ac45fa MZ |
105 | head_name=$(cat "$state_dir"/head-name) && |
106 | onto=$(cat "$state_dir"/onto) && | |
84df4560 MZ |
107 | # We always write to orig-head, but interactive rebase used to write to |
108 | # head. Fall back to reading from head to cover for the case that the | |
109 | # user upgraded git with an ongoing interactive rebase. | |
110 | if test -f "$state_dir"/orig-head | |
2959c283 | 111 | then |
2959c283 | 112 | orig_head=$(cat "$state_dir"/orig-head) |
84df4560 MZ |
113 | else |
114 | orig_head=$(cat "$state_dir"/head) | |
2959c283 | 115 | fi && |
7b37a7c6 MZ |
116 | GIT_QUIET=$(cat "$state_dir"/quiet) && |
117 | test -f "$state_dir"/verbose && verbose=t | |
80ff4795 MZ |
118 | test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" |
119 | test -f "$state_dir"/strategy_opts && | |
120 | strategy_opts="$(cat "$state_dir"/strategy_opts)" | |
b3e4847e MZ |
121 | test -f "$state_dir"/allow_rerere_autoupdate && |
122 | allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)" | |
3ee5e540 NV |
123 | test -f "$state_dir"/gpg_sign_opt && |
124 | gpg_sign_opt="$(cat "$state_dir"/gpg_sign_opt)" | |
a852ec7f PW |
125 | test -f "$state_dir"/signoff && { |
126 | signoff="$(cat "$state_dir"/signoff)" | |
127 | force_rebase=t | |
128 | } | |
02ac45fa MZ |
129 | } |
130 | ||
e4244eb3 | 131 | finish_rebase () { |
fbd7a232 | 132 | rm -f "$(git rev-parse --git-path REBASE_HEAD)" |
e4244eb3 | 133 | apply_autostash && |
8c24f5b0 | 134 | { git gc --auto || true; } && |
58794775 RR |
135 | rm -rf "$state_dir" |
136 | } | |
137 | ||
0af129b2 AG |
138 | run_interactive () { |
139 | GIT_CHERRY_PICK_HELP="$resolvemsg" | |
140 | export GIT_CHERRY_PICK_HELP | |
141 | ||
142 | test -n "$keep_empty" && keep_empty="--keep-empty" | |
143 | test -n "$rebase_merges" && rebase_merges="--rebase-merges" | |
144 | test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins" | |
145 | test -n "$autosquash" && autosquash="--autosquash" | |
146 | test -n "$verbose" && verbose="--verbose" | |
147 | test -n "$force_rebase" && force_rebase="--no-ff" | |
148 | test -n "$restrict_revision" && \ | |
149 | restrict_revision="--restrict-revision=^$restrict_revision" | |
150 | test -n "$upstream" && upstream="--upstream=$upstream" | |
151 | test -n "$onto" && onto="--onto=$onto" | |
152 | test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto" | |
153 | test -n "$onto_name" && onto_name="--onto-name=$onto_name" | |
154 | test -n "$head_name" && head_name="--head-name=$head_name" | |
155 | test -n "$strategy" && strategy="--strategy=$strategy" | |
156 | test -n "$strategy_opts" && strategy_opts="--strategy-opts=$strategy_opts" | |
157 | test -n "$switch_to" && switch_to="--switch-to=$switch_to" | |
158 | test -n "$cmd" && cmd="--cmd=$cmd" | |
159 | test -n "$action" && action="--$action" | |
160 | ||
cf808208 | 161 | exec git rebase--interactive "$action" "$keep_empty" "$rebase_merges" "$rebase_cousins" \ |
0af129b2 AG |
162 | "$upstream" "$onto" "$squash_onto" "$restrict_revision" \ |
163 | "$allow_empty_message" "$autosquash" "$verbose" \ | |
164 | "$force_rebase" "$onto_name" "$head_name" "$strategy" \ | |
165 | "$strategy_opts" "$cmd" "$switch_to" \ | |
166 | "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" | |
167 | } | |
168 | ||
8cd65967 | 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 |
6d98d0c0 | 175 | |
0af129b2 | 176 | if test -n "$interactive_rebase" -a -z "$preserve_merges" |
6d98d0c0 | 177 | then |
0af129b2 | 178 | run_interactive |
6d98d0c0 | 179 | else |
0af129b2 AG |
180 | . git-rebase--$type |
181 | ||
182 | if test -z "$preserve_merges" | |
183 | then | |
184 | git_rebase__$type | |
185 | else | |
186 | git_rebase__preserve_merges | |
187 | fi | |
6d98d0c0 AG |
188 | fi |
189 | ||
f5f758a5 RR |
190 | ret=$? |
191 | if test $ret -eq 0 | |
192 | then | |
58794775 | 193 | finish_rebase |
b97e1873 | 194 | elif test $ret -eq 2 # special exit status for rebase -p |
e4244eb3 RR |
195 | then |
196 | apply_autostash && | |
197 | rm -rf "$state_dir" && | |
198 | die "Nothing to do" | |
f5f758a5 RR |
199 | fi |
200 | exit $ret | |
1b1dce4b JS |
201 | } |
202 | ||
d70b4a8f | 203 | run_pre_rebase_hook () { |
6bb4e485 | 204 | if test -z "$ok_to_skip_pre_rebase" && |
b849b954 | 205 | test -x "$(git rev-parse --git-path hooks/pre-rebase)" |
d70b4a8f | 206 | then |
b849b954 | 207 | "$(git rev-parse --git-path hooks/pre-rebase)" ${1+"$@"} || |
c7108bf9 | 208 | die "$(gettext "The pre-rebase hook refused to rebase.")" |
d70b4a8f NS |
209 | fi |
210 | } | |
211 | ||
69a636ad | 212 | test -f "$apply_dir"/applying && |
82cb775c | 213 | die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")" |
9b752a6e | 214 | |
99de0640 MZ |
215 | if test -d "$apply_dir" |
216 | then | |
217 | type=am | |
218 | state_dir="$apply_dir" | |
219 | elif test -d "$merge_dir" | |
220 | then | |
6d98d0c0 AG |
221 | if test -d "$merge_dir"/rewritten |
222 | then | |
223 | type=preserve-merges | |
224 | interactive_rebase=explicit | |
225 | preserve_merges=t | |
226 | elif test -f "$merge_dir"/interactive | |
99de0640 MZ |
227 | then |
228 | type=interactive | |
229 | interactive_rebase=explicit | |
230 | else | |
231 | type=merge | |
232 | fi | |
233 | state_dir="$merge_dir" | |
234 | fi | |
235 | test -n "$type" && in_progress=t | |
236 | ||
95135b06 | 237 | total_argc=$# |
822f7c73 | 238 | while test $# != 0 |
e646c9c8 JH |
239 | do |
240 | case "$1" in | |
c4427656 | 241 | --no-verify) |
6bb4e485 | 242 | ok_to_skip_pre_rebase=yes |
c4427656 | 243 | ;; |
7baf9c4b | 244 | --verify) |
6bb4e485 | 245 | ok_to_skip_pre_rebase= |
7baf9c4b | 246 | ;; |
66335298 | 247 | --continue|--skip|--abort|--quit|--edit-todo|--show-current-patch) |
45e2acf3 | 248 | test $total_argc -eq 2 || usage |
34262322 | 249 | action=${1##--} |
031321c6 | 250 | ;; |
b6e9e73e NV |
251 | --onto=*) |
252 | onto="${1#--onto=}" | |
e646c9c8 | 253 | ;; |
b6e9e73e NV |
254 | --exec=*) |
255 | cmd="${cmd}exec ${1#--exec=}${LF}" | |
78ec2400 | 256 | test -z "$interactive_rebase" && interactive_rebase=implied |
c2145384 | 257 | ;; |
b6e9e73e | 258 | --interactive) |
cf432ca0 MZ |
259 | interactive_rebase=explicit |
260 | ;; | |
b6e9e73e | 261 | --keep-empty) |
90e1818f NH |
262 | keep_empty=yes |
263 | ;; | |
a6c612b5 GS |
264 | --allow-empty-message) |
265 | allow_empty_message=--allow-empty-message | |
266 | ;; | |
3d946165 PW |
267 | --no-keep-empty) |
268 | keep_empty= | |
269 | ;; | |
8f6aed71 JS |
270 | --rebase-merges) |
271 | rebase_merges=t | |
272 | test -z "$interactive_rebase" && interactive_rebase=implied | |
273 | ;; | |
7543f6f4 JS |
274 | --rebase-merges=*) |
275 | rebase_merges=t | |
276 | case "${1#*=}" in | |
277 | rebase-cousins) rebase_cousins=t;; | |
278 | no-rebase-cousins) rebase_cousins=;; | |
279 | *) die "Unknown mode: $1";; | |
280 | esac | |
281 | test -z "$interactive_rebase" && interactive_rebase=implied | |
282 | ;; | |
b6e9e73e | 283 | --preserve-merges) |
cf432ca0 MZ |
284 | preserve_merges=t |
285 | test -z "$interactive_rebase" && interactive_rebase=implied | |
286 | ;; | |
287 | --autosquash) | |
288 | autosquash=t | |
289 | ;; | |
290 | --no-autosquash) | |
291 | autosquash= | |
292 | ;; | |
ad8261d2 JK |
293 | --fork-point) |
294 | fork_point=t | |
295 | ;; | |
296 | --no-fork-point) | |
297 | fork_point= | |
298 | ;; | |
b6e9e73e | 299 | --merge) |
58634dbf EW |
300 | do_merge=t |
301 | ;; | |
b6e9e73e | 302 | --strategy-option=*) |
0060041d | 303 | strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)" |
93ce190c | 304 | do_merge=t |
9765b6ab | 305 | test -z "$strategy" && strategy=recursive |
93ce190c | 306 | ;; |
b6e9e73e NV |
307 | --strategy=*) |
308 | strategy="${1#--strategy=}" | |
58634dbf EW |
309 | do_merge=t |
310 | ;; | |
b6e9e73e | 311 | --no-stat) |
a9c3821c TAV |
312 | diffstat= |
313 | ;; | |
314 | --stat) | |
315 | diffstat=t | |
316 | ;; | |
58794775 RR |
317 | --autostash) |
318 | autostash=true | |
319 | ;; | |
619e3604 JK |
320 | --no-autostash) |
321 | autostash=false | |
322 | ;; | |
b6e9e73e | 323 | --verbose) |
b758789c | 324 | verbose=t |
a9c3821c | 325 | diffstat=t |
0e987a12 SB |
326 | GIT_QUIET= |
327 | ;; | |
b6e9e73e | 328 | --quiet) |
0e987a12 SB |
329 | GIT_QUIET=t |
330 | git_am_opt="$git_am_opt -q" | |
331 | verbose= | |
332 | diffstat= | |
b758789c | 333 | ;; |
b6e9e73e NV |
334 | --whitespace=*) |
335 | git_am_opt="$git_am_opt --whitespace=${1#--whitespace=}" | |
336 | case "${1#--whitespace=}" in | |
45e2acf3 | 337 | fix|strip) |
b2f82e05 SR |
338 | force_rebase=t |
339 | ;; | |
340 | esac | |
059f446d | 341 | ;; |
86c91f91 GB |
342 | --ignore-whitespace) |
343 | git_am_opt="$git_am_opt $1" | |
344 | ;; | |
a852ec7f PW |
345 | --signoff) |
346 | signoff=--signoff | |
347 | ;; | |
348 | --no-signoff) | |
349 | signoff= | |
350 | ;; | |
351 | --committer-date-is-author-date|--ignore-date) | |
570ccad3 MB |
352 | git_am_opt="$git_am_opt $1" |
353 | force_rebase=t | |
354 | ;; | |
b6e9e73e NV |
355 | -C*) |
356 | git_am_opt="$git_am_opt $1" | |
67dad687 | 357 | ;; |
190f5323 TR |
358 | --root) |
359 | rebase_root=t | |
360 | ;; | |
b6e9e73e | 361 | --force-rebase|--no-ff) |
b2f82e05 SR |
362 | force_rebase=t |
363 | ;; | |
cb6020bb JH |
364 | --rerere-autoupdate|--no-rerere-autoupdate) |
365 | allow_rerere_autoupdate="$1" | |
366 | ;; | |
3ee5e540 NV |
367 | --gpg-sign) |
368 | gpg_sign_opt=-S | |
369 | ;; | |
370 | --gpg-sign=*) | |
371 | gpg_sign_opt="-S${1#--gpg-sign=}" | |
372 | ;; | |
45e2acf3 MZ |
373 | --) |
374 | shift | |
e646c9c8 JH |
375 | break |
376 | ;; | |
697bc885 BC |
377 | *) |
378 | usage | |
379 | ;; | |
e646c9c8 JH |
380 | esac |
381 | shift | |
382 | done | |
51b2ead0 | 383 | test $# -gt 2 && usage |
2db8aaec | 384 | |
cf432ca0 MZ |
385 | if test -n "$action" |
386 | then | |
c7108bf9 | 387 | test -z "$in_progress" && die "$(gettext "No rebase in progress?")" |
2959c283 | 388 | # Only interactive rebase uses detailed reflog messages |
6d98d0c0 | 389 | if test -n "$interactive_rebase" && test "$GIT_REFLOG_ACTION" = rebase |
2959c283 MZ |
390 | then |
391 | GIT_REFLOG_ACTION="rebase -i ($action)" | |
392 | export GIT_REFLOG_ACTION | |
393 | fi | |
cf432ca0 | 394 | fi |
34262322 | 395 | |
6d98d0c0 | 396 | if test "$action" = "edit-todo" && test -z "$interactive_rebase" |
eb9a7cb4 AW |
397 | then |
398 | die "$(gettext "The --edit-todo action can only be used during interactive rebase.")" | |
399 | fi | |
400 | ||
34262322 MZ |
401 | case "$action" in |
402 | continue) | |
2959c283 MZ |
403 | # Sanity check |
404 | git rev-parse --verify HEAD >/dev/null || | |
c7108bf9 | 405 | die "$(gettext "Cannot read HEAD")" |
34262322 MZ |
406 | git update-index --ignore-submodules --refresh && |
407 | git diff-files --quiet --ignore-submodules || { | |
c7108bf9 JX |
408 | echo "$(gettext "You must edit all merge conflicts and then |
409 | mark them as resolved using git add")" | |
34262322 MZ |
410 | exit 1 |
411 | } | |
fa99c1e1 MZ |
412 | read_basic_state |
413 | run_specific_rebase | |
34262322 MZ |
414 | ;; |
415 | skip) | |
4974c2ca | 416 | output git reset --hard HEAD || exit $? |
fa99c1e1 MZ |
417 | read_basic_state |
418 | run_specific_rebase | |
34262322 MZ |
419 | ;; |
420 | abort) | |
421 | git rerere clear | |
fa99c1e1 | 422 | read_basic_state |
34262322 MZ |
423 | case "$head_name" in |
424 | refs/*) | |
ea69619c | 425 | git symbolic-ref -m "rebase: aborting" HEAD $head_name || |
c7108bf9 | 426 | die "$(eval_gettext "Could not move back to \$head_name")" |
34262322 MZ |
427 | ;; |
428 | esac | |
4974c2ca | 429 | output git reset --hard $orig_head |
58794775 | 430 | finish_rebase |
34262322 MZ |
431 | exit |
432 | ;; | |
9512177b NTND |
433 | quit) |
434 | exec rm -rf "$state_dir" | |
435 | ;; | |
eb9a7cb4 AW |
436 | edit-todo) |
437 | run_specific_rebase | |
438 | ;; | |
66335298 NTND |
439 | show-current-patch) |
440 | run_specific_rebase | |
441 | die "BUG: run_specific_rebase is not supposed to return here" | |
442 | ;; | |
34262322 MZ |
443 | esac |
444 | ||
99de0640 MZ |
445 | # Make sure no rebase is in progress |
446 | if test -n "$in_progress" | |
7f4bd5d8 | 447 | then |
c7108bf9 JX |
448 | state_dir_base=${state_dir##*/} |
449 | cmd_live_rebase="git rebase (--continue | --abort | --skip)" | |
450 | cmd_clear_stale_rebase="rm -fr \"$state_dir\"" | |
451 | die " | |
452 | $(eval_gettext 'It seems that there is already a $state_dir_base directory, and | |
e39beac6 | 453 | I wonder if you are in the middle of another rebase. If that is the |
99de0640 | 454 | case, please try |
c7108bf9 | 455 | $cmd_live_rebase |
99de0640 | 456 | If that is not the case, please |
c7108bf9 | 457 | $cmd_clear_stale_rebase |
9b752a6e | 458 | and run me again. I am stopping in case you still have something |
c7108bf9 | 459 | valuable there.')" |
7f4bd5d8 JH |
460 | fi |
461 | ||
df5df20c CW |
462 | if test -n "$rebase_root" && test -z "$onto" |
463 | then | |
464 | test -z "$interactive_rebase" && interactive_rebase=implied | |
465 | fi | |
466 | ||
da27a6fb PW |
467 | if test -n "$keep_empty" |
468 | then | |
469 | test -z "$interactive_rebase" && interactive_rebase=implied | |
df5df20c CW |
470 | fi |
471 | ||
cf432ca0 MZ |
472 | if test -n "$interactive_rebase" |
473 | then | |
6d98d0c0 AG |
474 | if test -z "$preserve_merges" |
475 | then | |
476 | type=interactive | |
477 | else | |
478 | type=preserve-merges | |
479 | fi | |
480 | ||
cf432ca0 MZ |
481 | state_dir="$merge_dir" |
482 | elif test -n "$do_merge" | |
483 | then | |
484 | type=merge | |
485 | state_dir="$merge_dir" | |
486 | else | |
487 | type=am | |
488 | state_dir="$apply_dir" | |
489 | fi | |
490 | ||
9eaa858e KW |
491 | if test -t 2 && test -z "$GIT_QUIET" |
492 | then | |
493 | git_format_patch_opt="$git_format_patch_opt --progress" | |
494 | fi | |
495 | ||
c840e1af EN |
496 | if test -n "$git_am_opt"; then |
497 | incompatible_opts=$(echo " $git_am_opt " | \ | |
498 | sed -e 's/ -q / /g' -e 's/^ \(.*\) $/\1/') | |
499 | if test -n "$interactive_rebase" | |
500 | then | |
501 | if test -n "$incompatible_opts" | |
502 | then | |
503 | die "$(gettext "error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options ($incompatible_opts)")" | |
504 | fi | |
505 | fi | |
506 | if test -n "$do_merge"; then | |
507 | if test -n "$incompatible_opts" | |
508 | then | |
509 | die "$(gettext "error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ($incompatible_opts)")" | |
510 | fi | |
511 | fi | |
512 | fi | |
513 | ||
a852ec7f PW |
514 | if test -n "$signoff" |
515 | then | |
b79966aa PW |
516 | test -n "$preserve_merges" && |
517 | die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")" | |
a852ec7f PW |
518 | git_am_opt="$git_am_opt $signoff" |
519 | force_rebase=t | |
520 | fi | |
521 | ||
c840e1af EN |
522 | if test -n "$preserve_merges" |
523 | then | |
524 | # Note: incompatibility with --signoff handled in signoff block above | |
525 | # Note: incompatibility with --interactive is just a strong warning; | |
526 | # git-rebase.txt caveats with "unless you know what you are doing" | |
527 | test -n "$rebase_merges" && | |
1cfc4c85 | 528 | die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")" |
c840e1af EN |
529 | fi |
530 | ||
531 | if test -n "$rebase_merges" | |
532 | then | |
533 | test -n "$strategy_opts" && | |
1cfc4c85 | 534 | die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")" |
c840e1af | 535 | test -n "$strategy" && |
1cfc4c85 | 536 | die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" |
c840e1af EN |
537 | fi |
538 | ||
190f5323 TR |
539 | if test -z "$rebase_root" |
540 | then | |
15a147e6 MZ |
541 | case "$#" in |
542 | 0) | |
543 | if ! upstream_name=$(git rev-parse --symbolic-full-name \ | |
544 | --verify -q @{upstream} 2>/dev/null) | |
545 | then | |
546 | . git-parse-remote | |
547 | error_on_missing_default_upstream "rebase" "rebase" \ | |
c36d8eee | 548 | "against" "git rebase $(gettext '<branch>')" |
15a147e6 | 549 | fi |
ad8261d2 JK |
550 | |
551 | test "$fork_point" = auto && fork_point=t | |
15a147e6 MZ |
552 | ;; |
553 | *) upstream_name="$1" | |
4f407407 BG |
554 | if test "$upstream_name" = "-" |
555 | then | |
556 | upstream_name="@{-1}" | |
557 | fi | |
15a147e6 MZ |
558 | shift |
559 | ;; | |
560 | esac | |
2e6e276d | 561 | upstream=$(peel_committish "${upstream_name}") || |
ca7de7b1 | 562 | die "$(eval_gettext "invalid upstream '\$upstream_name'")" |
190f5323 TR |
563 | upstream_arg="$upstream_name" |
564 | else | |
df5df20c CW |
565 | if test -z "$onto" |
566 | then | |
728fc79c EP |
567 | empty_tree=$(git hash-object -t tree /dev/null) |
568 | onto=$(git commit-tree $empty_tree </dev/null) | |
df5df20c CW |
569 | squash_onto="$onto" |
570 | fi | |
190f5323 TR |
571 | unset upstream_name |
572 | unset upstream | |
f2b6a199 | 573 | test $# -gt 1 && usage |
46df82d5 | 574 | upstream_arg=--root |
190f5323 | 575 | fi |
32d99544 | 576 | |
a1bf91e0 | 577 | # Make sure the branch to rebase onto is valid. |
6bb4e485 | 578 | onto_name=${onto-"$upstream_name"} |
9f21e97d NS |
579 | case "$onto_name" in |
580 | *...*) | |
581 | if left=${onto_name%...*} right=${onto_name#*...} && | |
582 | onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD}) | |
583 | then | |
584 | case "$onto" in | |
585 | ?*"$LF"?*) | |
c7108bf9 | 586 | die "$(eval_gettext "\$onto_name: there are more than one merge bases")" |
9f21e97d NS |
587 | ;; |
588 | '') | |
c7108bf9 | 589 | die "$(eval_gettext "\$onto_name: there is no merge base")" |
9f21e97d NS |
590 | ;; |
591 | esac | |
592 | else | |
c7108bf9 | 593 | die "$(eval_gettext "\$onto_name: there is no merge base")" |
9f21e97d NS |
594 | fi |
595 | ;; | |
596 | *) | |
2e6e276d | 597 | onto=$(peel_committish "$onto_name") || |
c7108bf9 | 598 | die "$(eval_gettext "Does not point to a valid commit: \$onto_name")" |
9f21e97d NS |
599 | ;; |
600 | esac | |
a1bf91e0 | 601 | |
0cb06644 | 602 | # If the branch to rebase is given, that is the branch we will rebase |
3a9156ad | 603 | # $branch_name -- branch/commit being rebased, or HEAD (already detached) |
0cb06644 JH |
604 | # $orig_head -- commit object name of tip of the branch before rebasing |
605 | # $head_name -- refs/heads/<that-branch> or "detached HEAD" | |
606 | switch_to= | |
59e6b23a | 607 | case "$#" in |
190f5323 | 608 | 1) |
0cb06644 | 609 | # Is it "rebase other $branchname" or "rebase other $commit"? |
190f5323 TR |
610 | branch_name="$1" |
611 | switch_to="$1" | |
0cb06644 | 612 | |
3a9156ad KS |
613 | # Is it a local branch? |
614 | if git show-ref --verify --quiet -- "refs/heads/$branch_name" && | |
615 | orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name") | |
0cb06644 | 616 | then |
3a9156ad KS |
617 | head_name="refs/heads/$branch_name" |
618 | # If not is it a valid ref (branch or commit)? | |
619 | elif orig_head=$(git rev-parse -q --verify "$branch_name") | |
0cb06644 JH |
620 | then |
621 | head_name="detached HEAD" | |
3a9156ad | 622 | |
0cb06644 | 623 | else |
ca7de7b1 | 624 | die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")" |
0cb06644 | 625 | fi |
e646c9c8 | 626 | ;; |
f2b6a199 | 627 | 0) |
0cb06644 | 628 | # Do not need to switch branches, we are already on it. |
728fc79c | 629 | if branch_name=$(git symbolic-ref -q HEAD) |
bcf31618 | 630 | then |
0cb06644 | 631 | head_name=$branch_name |
728fc79c | 632 | branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)') |
bcf31618 | 633 | else |
0cb06644 | 634 | head_name="detached HEAD" |
3a9156ad | 635 | branch_name=HEAD |
bcf31618 | 636 | fi |
ea709800 | 637 | orig_head=$(git rev-parse --verify HEAD) || exit |
e646c9c8 | 638 | ;; |
f2b6a199 MZ |
639 | *) |
640 | die "BUG: unexpected number of arguments left to parse" | |
641 | ;; | |
59e6b23a JH |
642 | esac |
643 | ||
ad8261d2 JK |
644 | if test "$fork_point" = t |
645 | then | |
bb3f4583 JK |
646 | new_upstream=$(git merge-base --fork-point "$upstream_name" \ |
647 | "${switch_to:-HEAD}") | |
ad8261d2 JK |
648 | if test -n "$new_upstream" |
649 | then | |
1e0dacdb | 650 | restrict_revision=$new_upstream |
ad8261d2 JK |
651 | fi |
652 | fi | |
653 | ||
58794775 RR |
654 | if test "$autostash" = true && ! (require_clean_work_tree) 2>/dev/null |
655 | then | |
656 | stash_sha1=$(git stash create "autostash") || | |
657 | die "$(gettext 'Cannot autostash')" | |
658 | ||
659 | mkdir -p "$state_dir" && | |
660 | echo $stash_sha1 >"$state_dir/autostash" && | |
661 | stash_abbrev=$(git rev-parse --short $stash_sha1) && | |
662 | echo "$(eval_gettext 'Created autostash: $stash_abbrev')" && | |
663 | git reset --hard | |
664 | fi | |
665 | ||
c7108bf9 | 666 | require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")" |
8f9bfb64 | 667 | |
cb82a05d MZ |
668 | # Now we are rebasing commits $upstream..$orig_head (or with --root, |
669 | # everything leading up to $orig_head) on top of $onto | |
e646c9c8 | 670 | |
1308c17b | 671 | # Check if we are already based on $onto with linear history, |
cc1453e1 MZ |
672 | # but this should be done only when upstream and onto are the same |
673 | # and if this is not an interactive rebase. | |
cb82a05d | 674 | mb=$(git merge-base "$onto" "$orig_head") |
6d98d0c0 | 675 | if test -z "$interactive_rebase" && test "$upstream" = "$onto" && |
1e0dacdb | 676 | test "$mb" = "$onto" && test -z "$restrict_revision" && |
1308c17b | 677 | # linear history? |
cb82a05d | 678 | ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null |
7f4bd5d8 | 679 | then |
b2f82e05 SR |
680 | if test -z "$force_rebase" |
681 | then | |
682 | # Lazily switch to the target branch if needed... | |
4b03df21 RR |
683 | test -z "$switch_to" || |
684 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \ | |
22946a94 | 685 | git checkout -q "$switch_to" -- |
08e66700 KS |
686 | if test "$branch_name" = "HEAD" && |
687 | ! git symbolic-ref -q HEAD | |
688 | then | |
689 | say "$(eval_gettext "HEAD is up to date.")" | |
690 | else | |
691 | say "$(eval_gettext "Current branch \$branch_name is up to date.")" | |
692 | fi | |
96e2b99e | 693 | finish_rebase |
b2f82e05 SR |
694 | exit 0 |
695 | else | |
08e66700 KS |
696 | if test "$branch_name" = "HEAD" && |
697 | ! git symbolic-ref -q HEAD | |
698 | then | |
699 | say "$(eval_gettext "HEAD is up to date, rebase forced.")" | |
700 | else | |
701 | say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")" | |
702 | fi | |
b2f82e05 | 703 | fi |
7f4bd5d8 JH |
704 | fi |
705 | ||
8f9bfb64 MZ |
706 | # If a hook exists, give it a chance to interrupt |
707 | run_pre_rebase_hook "$upstream_arg" "$@" | |
708 | ||
a9c3821c TAV |
709 | if test -n "$diffstat" |
710 | then | |
711 | if test -n "$verbose" | |
712 | then | |
c7108bf9 | 713 | echo "$(eval_gettext "Changes from \$mb to \$onto:")" |
a9c3821c TAV |
714 | fi |
715 | # We want color (if set), but no pager | |
716 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" | |
717 | fi | |
718 | ||
6d98d0c0 | 719 | test -n "$interactive_rebase" && run_specific_rebase |
f4107d9c MZ |
720 | |
721 | # Detach HEAD and reset the tree | |
c7108bf9 | 722 | say "$(gettext "First, rewinding head to replay your work on top of it...")" |
4b03df21 RR |
723 | |
724 | GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \ | |
725 | git checkout -q "$onto^0" || die "could not detach HEAD" | |
cb82a05d | 726 | git update-ref ORIG_HEAD $orig_head |
f4107d9c | 727 | |
e646c9c8 | 728 | # If the $onto is a proper descendant of the tip of the branch, then |
a75d7b54 | 729 | # we just fast-forwarded. |
cb82a05d | 730 | if test "$mb" = "$orig_head" |
32d99544 | 731 | then |
c7108bf9 | 732 | say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")" |
6fd2f5e6 | 733 | move_to_original_branch |
af2f0ebc | 734 | finish_rebase |
32d99544 LS |
735 | exit 0 |
736 | fi | |
737 | ||
190f5323 TR |
738 | if test -n "$rebase_root" |
739 | then | |
740 | revisions="$onto..$orig_head" | |
741 | else | |
1e0dacdb | 742 | revisions="${restrict_revision-$upstream}..$orig_head" |
190f5323 TR |
743 | fi |
744 | ||
fa99c1e1 | 745 | run_specific_rebase |