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