2 * "git rebase" builtin command
4 * Copyright (c) 2018 Pratik Karki
8 #include "run-command.h"
10 #include "argv-array.h"
16 #include "cache-tree.h"
17 #include "unpack-trees.h"
19 #include "parse-options.h"
22 #include "wt-status.h"
24 #include "commit-reach.h"
27 static char const * const builtin_rebase_usage
[] = {
28 N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
29 "[<upstream>] [<branch>]"),
30 N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
32 N_("git rebase --continue | --abort | --skip | --edit-todo"),
36 static GIT_PATH_FUNC(apply_dir
, "rebase-apply")
37 static GIT_PATH_FUNC(merge_dir
, "rebase-merge")
40 REBASE_UNSPECIFIED
= -1,
44 REBASE_PRESERVE_MERGES
47 static int use_builtin_rebase(void)
49 struct child_process cp
= CHILD_PROCESS_INIT
;
50 struct strbuf out
= STRBUF_INIT
;
53 argv_array_pushl(&cp
.args
,
54 "config", "--bool", "rebase.usebuiltin", NULL
);
56 if (capture_command(&cp
, &out
, 6)) {
62 ret
= !strcmp("true", out
.buf
);
67 struct rebase_options
{
68 enum rebase_type type
;
69 const char *state_dir
;
70 struct commit
*upstream
;
71 const char *upstream_name
;
72 const char *upstream_arg
;
74 struct object_id orig_head
;
76 const char *onto_name
;
77 const char *revisions
;
78 const char *switch_to
;
80 struct object_id
*squash_onto
;
81 struct commit
*restrict_revision
;
82 int dont_finish_rebase
;
84 REBASE_NO_QUIET
= 1<<0,
85 REBASE_VERBOSE
= 1<<1,
86 REBASE_DIFFSTAT
= 1<<2,
88 REBASE_INTERACTIVE_EXPLICIT
= 1<<4,
90 struct strbuf git_am_opt
;
93 int allow_rerere_autoupdate
;
99 int allow_empty_message
;
100 int rebase_merges
, rebase_cousins
;
101 char *strategy
, *strategy_opts
;
102 struct strbuf git_format_patch_opt
;
105 static int is_interactive(struct rebase_options
*opts
)
107 return opts
->type
== REBASE_INTERACTIVE
||
108 opts
->type
== REBASE_PRESERVE_MERGES
;
111 static void imply_interactive(struct rebase_options
*opts
, const char *option
)
113 switch (opts
->type
) {
115 die(_("%s requires an interactive rebase"), option
);
117 case REBASE_INTERACTIVE
:
118 case REBASE_PRESERVE_MERGES
:
121 /* we silently *upgrade* --merge to --interactive if needed */
123 opts
->type
= REBASE_INTERACTIVE
; /* implied */
128 /* Returns the filename prefixed by the state_dir */
129 static const char *state_dir_path(const char *filename
, struct rebase_options
*opts
)
131 static struct strbuf path
= STRBUF_INIT
;
132 static size_t prefix_len
;
135 strbuf_addf(&path
, "%s/", opts
->state_dir
);
136 prefix_len
= path
.len
;
139 strbuf_setlen(&path
, prefix_len
);
140 strbuf_addstr(&path
, filename
);
144 /* Read one file, then strip line endings */
145 static int read_one(const char *path
, struct strbuf
*buf
)
147 if (strbuf_read_file(buf
, path
, 0) < 0)
148 return error_errno(_("could not read '%s'"), path
);
149 strbuf_trim_trailing_newline(buf
);
153 /* Initialize the rebase options from the state directory. */
154 static int read_basic_state(struct rebase_options
*opts
)
156 struct strbuf head_name
= STRBUF_INIT
;
157 struct strbuf buf
= STRBUF_INIT
;
158 struct object_id oid
;
160 if (read_one(state_dir_path("head-name", opts
), &head_name
) ||
161 read_one(state_dir_path("onto", opts
), &buf
))
163 opts
->head_name
= starts_with(head_name
.buf
, "refs/") ?
164 xstrdup(head_name
.buf
) : NULL
;
165 strbuf_release(&head_name
);
166 if (get_oid(buf
.buf
, &oid
))
167 return error(_("could not get 'onto': '%s'"), buf
.buf
);
168 opts
->onto
= lookup_commit_or_die(&oid
, buf
.buf
);
171 * We always write to orig-head, but interactive rebase used to write to
172 * head. Fall back to reading from head to cover for the case that the
173 * user upgraded git with an ongoing interactive rebase.
176 if (file_exists(state_dir_path("orig-head", opts
))) {
177 if (read_one(state_dir_path("orig-head", opts
), &buf
))
179 } else if (read_one(state_dir_path("head", opts
), &buf
))
181 if (get_oid(buf
.buf
, &opts
->orig_head
))
182 return error(_("invalid orig-head: '%s'"), buf
.buf
);
185 if (read_one(state_dir_path("quiet", opts
), &buf
))
188 opts
->flags
&= ~REBASE_NO_QUIET
;
190 opts
->flags
|= REBASE_NO_QUIET
;
192 if (file_exists(state_dir_path("verbose", opts
)))
193 opts
->flags
|= REBASE_VERBOSE
;
195 if (file_exists(state_dir_path("signoff", opts
))) {
197 opts
->flags
|= REBASE_FORCE
;
200 if (file_exists(state_dir_path("allow_rerere_autoupdate", opts
))) {
202 if (read_one(state_dir_path("allow_rerere_autoupdate", opts
),
205 if (!strcmp(buf
.buf
, "--rerere-autoupdate"))
206 opts
->allow_rerere_autoupdate
= 1;
207 else if (!strcmp(buf
.buf
, "--no-rerere-autoupdate"))
208 opts
->allow_rerere_autoupdate
= 0;
210 warning(_("ignoring invalid allow_rerere_autoupdate: "
213 opts
->allow_rerere_autoupdate
= -1;
215 if (file_exists(state_dir_path("gpg_sign_opt", opts
))) {
217 if (read_one(state_dir_path("gpg_sign_opt", opts
),
220 free(opts
->gpg_sign_opt
);
221 opts
->gpg_sign_opt
= xstrdup(buf
.buf
);
224 if (file_exists(state_dir_path("strategy", opts
))) {
226 if (read_one(state_dir_path("strategy", opts
), &buf
))
228 free(opts
->strategy
);
229 opts
->strategy
= xstrdup(buf
.buf
);
232 if (file_exists(state_dir_path("strategy_opts", opts
))) {
234 if (read_one(state_dir_path("strategy_opts", opts
), &buf
))
236 free(opts
->strategy_opts
);
237 opts
->strategy_opts
= xstrdup(buf
.buf
);
240 strbuf_release(&buf
);
245 static int apply_autostash(struct rebase_options
*opts
)
247 const char *path
= state_dir_path("autostash", opts
);
248 struct strbuf autostash
= STRBUF_INIT
;
249 struct child_process stash_apply
= CHILD_PROCESS_INIT
;
251 if (!file_exists(path
))
254 if (read_one(path
, &autostash
))
255 return error(_("Could not read '%s'"), path
);
256 /* Ensure that the hash is not mistaken for a number */
257 strbuf_addstr(&autostash
, "^0");
258 argv_array_pushl(&stash_apply
.args
,
259 "stash", "apply", autostash
.buf
, NULL
);
260 stash_apply
.git_cmd
= 1;
261 stash_apply
.no_stderr
= stash_apply
.no_stdout
=
262 stash_apply
.no_stdin
= 1;
263 if (!run_command(&stash_apply
))
264 printf(_("Applied autostash.\n"));
266 struct argv_array args
= ARGV_ARRAY_INIT
;
269 argv_array_pushl(&args
,
270 "stash", "store", "-m", "autostash", "-q",
271 autostash
.buf
, NULL
);
272 if (run_command_v_opt(args
.argv
, RUN_GIT_CMD
))
273 res
= error(_("Cannot store %s"), autostash
.buf
);
274 argv_array_clear(&args
);
275 strbuf_release(&autostash
);
280 _("Applying autostash resulted in conflicts.\n"
281 "Your changes are safe in the stash.\n"
282 "You can run \"git stash pop\" or \"git stash drop\" "
286 strbuf_release(&autostash
);
290 static int finish_rebase(struct rebase_options
*opts
)
292 struct strbuf dir
= STRBUF_INIT
;
293 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
295 delete_ref(NULL
, "REBASE_HEAD", NULL
, REF_NO_DEREF
);
296 apply_autostash(opts
);
297 close_all_packs(the_repository
->objects
);
299 * We ignore errors in 'gc --auto', since the
300 * user should see them.
302 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
303 strbuf_addstr(&dir
, opts
->state_dir
);
304 remove_dir_recursively(&dir
, 0);
305 strbuf_release(&dir
);
310 static struct commit
*peel_committish(const char *name
)
313 struct object_id oid
;
315 if (get_oid(name
, &oid
))
317 obj
= parse_object(the_repository
, &oid
);
318 return (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
321 static void add_var(struct strbuf
*buf
, const char *name
, const char *value
)
324 strbuf_addf(buf
, "unset %s; ", name
);
326 strbuf_addf(buf
, "%s=", name
);
327 sq_quote_buf(buf
, value
);
328 strbuf_addstr(buf
, "; ");
332 static const char *resolvemsg
=
333 N_("Resolve all conflicts manually, mark them as resolved with\n"
334 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
335 "You can instead skip this commit: run \"git rebase --skip\".\n"
336 "To abort and get back to the state before \"git rebase\", run "
337 "\"git rebase --abort\".");
339 static int run_specific_rebase(struct rebase_options
*opts
)
341 const char *argv
[] = { NULL
, NULL
};
342 struct strbuf script_snippet
= STRBUF_INIT
;
344 const char *backend
, *backend_func
;
346 if (opts
->type
== REBASE_INTERACTIVE
) {
347 /* Run builtin interactive rebase */
348 struct child_process child
= CHILD_PROCESS_INIT
;
350 argv_array_pushf(&child
.env_array
, "GIT_CHERRY_PICK_HELP=%s",
352 if (!(opts
->flags
& REBASE_INTERACTIVE_EXPLICIT
)) {
353 argv_array_push(&child
.env_array
, "GIT_EDITOR=:");
354 opts
->autosquash
= 0;
358 argv_array_push(&child
.args
, "rebase--interactive");
361 argv_array_pushf(&child
.args
, "--%s", opts
->action
);
362 if (opts
->keep_empty
)
363 argv_array_push(&child
.args
, "--keep-empty");
364 if (opts
->rebase_merges
)
365 argv_array_push(&child
.args
, "--rebase-merges");
366 if (opts
->rebase_cousins
)
367 argv_array_push(&child
.args
, "--rebase-cousins");
368 if (opts
->autosquash
)
369 argv_array_push(&child
.args
, "--autosquash");
370 if (opts
->flags
& REBASE_VERBOSE
)
371 argv_array_push(&child
.args
, "--verbose");
372 if (opts
->flags
& REBASE_FORCE
)
373 argv_array_push(&child
.args
, "--no-ff");
374 if (opts
->restrict_revision
)
375 argv_array_pushf(&child
.args
,
376 "--restrict-revision=^%s",
377 oid_to_hex(&opts
->restrict_revision
->object
.oid
));
379 argv_array_pushf(&child
.args
, "--upstream=%s",
380 oid_to_hex(&opts
->upstream
->object
.oid
));
382 argv_array_pushf(&child
.args
, "--onto=%s",
383 oid_to_hex(&opts
->onto
->object
.oid
));
384 if (opts
->squash_onto
)
385 argv_array_pushf(&child
.args
, "--squash-onto=%s",
386 oid_to_hex(opts
->squash_onto
));
388 argv_array_pushf(&child
.args
, "--onto-name=%s",
390 argv_array_pushf(&child
.args
, "--head-name=%s",
392 opts
->head_name
: "detached HEAD");
394 argv_array_pushf(&child
.args
, "--strategy=%s",
396 if (opts
->strategy_opts
)
397 argv_array_pushf(&child
.args
, "--strategy-opts=%s",
398 opts
->strategy_opts
);
400 argv_array_pushf(&child
.args
, "--switch-to=%s",
403 argv_array_pushf(&child
.args
, "--cmd=%s", opts
->cmd
);
404 if (opts
->allow_empty_message
)
405 argv_array_push(&child
.args
, "--allow-empty-message");
406 if (opts
->allow_rerere_autoupdate
> 0)
407 argv_array_push(&child
.args
, "--rerere-autoupdate");
408 else if (opts
->allow_rerere_autoupdate
== 0)
409 argv_array_push(&child
.args
, "--no-rerere-autoupdate");
410 if (opts
->gpg_sign_opt
)
411 argv_array_push(&child
.args
, opts
->gpg_sign_opt
);
413 argv_array_push(&child
.args
, "--signoff");
415 status
= run_command(&child
);
416 goto finished_rebase
;
419 add_var(&script_snippet
, "GIT_DIR", absolute_path(get_git_dir()));
420 add_var(&script_snippet
, "state_dir", opts
->state_dir
);
422 add_var(&script_snippet
, "upstream_name", opts
->upstream_name
);
423 add_var(&script_snippet
, "upstream", opts
->upstream
?
424 oid_to_hex(&opts
->upstream
->object
.oid
) : NULL
);
425 add_var(&script_snippet
, "head_name",
426 opts
->head_name
? opts
->head_name
: "detached HEAD");
427 add_var(&script_snippet
, "orig_head", oid_to_hex(&opts
->orig_head
));
428 add_var(&script_snippet
, "onto", opts
->onto
?
429 oid_to_hex(&opts
->onto
->object
.oid
) : NULL
);
430 add_var(&script_snippet
, "onto_name", opts
->onto_name
);
431 add_var(&script_snippet
, "revisions", opts
->revisions
);
432 add_var(&script_snippet
, "restrict_revision", opts
->restrict_revision
?
433 oid_to_hex(&opts
->restrict_revision
->object
.oid
) : NULL
);
434 add_var(&script_snippet
, "GIT_QUIET",
435 opts
->flags
& REBASE_NO_QUIET
? "" : "t");
436 add_var(&script_snippet
, "git_am_opt", opts
->git_am_opt
.buf
);
437 add_var(&script_snippet
, "verbose",
438 opts
->flags
& REBASE_VERBOSE
? "t" : "");
439 add_var(&script_snippet
, "diffstat",
440 opts
->flags
& REBASE_DIFFSTAT
? "t" : "");
441 add_var(&script_snippet
, "force_rebase",
442 opts
->flags
& REBASE_FORCE
? "t" : "");
444 add_var(&script_snippet
, "switch_to", opts
->switch_to
);
445 add_var(&script_snippet
, "action", opts
->action
? opts
->action
: "");
446 add_var(&script_snippet
, "signoff", opts
->signoff
? "--signoff" : "");
447 add_var(&script_snippet
, "allow_rerere_autoupdate",
448 opts
->allow_rerere_autoupdate
< 0 ? "" :
449 opts
->allow_rerere_autoupdate
?
450 "--rerere-autoupdate" : "--no-rerere-autoupdate");
451 add_var(&script_snippet
, "keep_empty", opts
->keep_empty
? "yes" : "");
452 add_var(&script_snippet
, "autosquash", opts
->autosquash
? "t" : "");
453 add_var(&script_snippet
, "gpg_sign_opt", opts
->gpg_sign_opt
);
454 add_var(&script_snippet
, "cmd", opts
->cmd
);
455 add_var(&script_snippet
, "allow_empty_message",
456 opts
->allow_empty_message
? "--allow-empty-message" : "");
457 add_var(&script_snippet
, "rebase_merges",
458 opts
->rebase_merges
? "t" : "");
459 add_var(&script_snippet
, "rebase_cousins",
460 opts
->rebase_cousins
? "t" : "");
461 add_var(&script_snippet
, "strategy", opts
->strategy
);
462 add_var(&script_snippet
, "strategy_opts", opts
->strategy_opts
);
463 add_var(&script_snippet
, "rebase_root", opts
->root
? "t" : "");
464 add_var(&script_snippet
, "squash_onto",
465 opts
->squash_onto
? oid_to_hex(opts
->squash_onto
) : "");
466 add_var(&script_snippet
, "git_format_patch_opt",
467 opts
->git_format_patch_opt
.buf
);
469 if (is_interactive(opts
) &&
470 !(opts
->flags
& REBASE_INTERACTIVE_EXPLICIT
)) {
471 strbuf_addstr(&script_snippet
,
472 "GIT_EDITOR=:; export GIT_EDITOR; ");
473 opts
->autosquash
= 0;
476 switch (opts
->type
) {
478 backend
= "git-rebase--am";
479 backend_func
= "git_rebase__am";
482 backend
= "git-rebase--merge";
483 backend_func
= "git_rebase__merge";
485 case REBASE_PRESERVE_MERGES
:
486 backend
= "git-rebase--preserve-merges";
487 backend_func
= "git_rebase__preserve_merges";
490 BUG("Unhandled rebase type %d", opts
->type
);
494 strbuf_addf(&script_snippet
,
495 ". git-sh-setup && . git-rebase--common &&"
496 " . %s && %s", backend
, backend_func
);
497 argv
[0] = script_snippet
.buf
;
499 status
= run_command_v_opt(argv
, RUN_USING_SHELL
);
501 if (opts
->dont_finish_rebase
)
503 else if (opts
->type
== REBASE_INTERACTIVE
)
504 ; /* interactive rebase cleans up after itself */
505 else if (status
== 0) {
506 if (!file_exists(state_dir_path("stopped-sha", opts
)))
508 } else if (status
== 2) {
509 struct strbuf dir
= STRBUF_INIT
;
511 apply_autostash(opts
);
512 strbuf_addstr(&dir
, opts
->state_dir
);
513 remove_dir_recursively(&dir
, 0);
514 strbuf_release(&dir
);
515 die("Nothing to do");
518 strbuf_release(&script_snippet
);
520 return status
? -1 : 0;
523 #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
525 static int reset_head(struct object_id
*oid
, const char *action
,
526 const char *switch_to_branch
, int detach_head
,
527 const char *reflog_orig_head
, const char *reflog_head
)
529 struct object_id head_oid
;
530 struct tree_desc desc
;
531 struct lock_file lock
= LOCK_INIT
;
532 struct unpack_trees_options unpack_tree_opts
;
534 const char *reflog_action
;
535 struct strbuf msg
= STRBUF_INIT
;
537 struct object_id
*orig
= NULL
, oid_orig
,
538 *old_orig
= NULL
, oid_old_orig
;
541 if (switch_to_branch
&& !starts_with(switch_to_branch
, "refs/"))
542 BUG("Not a fully qualified branch: '%s'", switch_to_branch
);
544 if (hold_locked_index(&lock
, LOCK_REPORT_ON_ERROR
) < 0)
548 if (get_oid("HEAD", &head_oid
)) {
549 rollback_lock_file(&lock
);
550 return error(_("could not determine HEAD revision"));
555 memset(&unpack_tree_opts
, 0, sizeof(unpack_tree_opts
));
556 setup_unpack_trees_porcelain(&unpack_tree_opts
, action
);
557 unpack_tree_opts
.head_idx
= 1;
558 unpack_tree_opts
.src_index
= the_repository
->index
;
559 unpack_tree_opts
.dst_index
= the_repository
->index
;
560 unpack_tree_opts
.fn
= oneway_merge
;
561 unpack_tree_opts
.update
= 1;
562 unpack_tree_opts
.merge
= 1;
564 unpack_tree_opts
.reset
= 1;
566 if (read_index_unmerged(the_repository
->index
) < 0) {
567 rollback_lock_file(&lock
);
568 return error(_("could not read index"));
571 if (!fill_tree_descriptor(&desc
, oid
)) {
572 error(_("failed to find tree of %s"), oid_to_hex(oid
));
573 rollback_lock_file(&lock
);
574 free((void *)desc
.buffer
);
578 if (unpack_trees(1, &desc
, &unpack_tree_opts
)) {
579 rollback_lock_file(&lock
);
580 free((void *)desc
.buffer
);
584 tree
= parse_tree_indirect(oid
);
585 prime_cache_tree(the_repository
->index
, tree
);
587 if (write_locked_index(the_repository
->index
, &lock
, COMMIT_LOCK
) < 0)
588 ret
= error(_("could not write index"));
589 free((void *)desc
.buffer
);
594 reflog_action
= getenv(GIT_REFLOG_ACTION_ENVIRONMENT
);
595 strbuf_addf(&msg
, "%s: ", reflog_action
? reflog_action
: "rebase");
596 prefix_len
= msg
.len
;
598 if (!get_oid("ORIG_HEAD", &oid_old_orig
))
599 old_orig
= &oid_old_orig
;
600 if (!get_oid("HEAD", &oid_orig
)) {
602 if (!reflog_orig_head
) {
603 strbuf_addstr(&msg
, "updating ORIG_HEAD");
604 reflog_orig_head
= msg
.buf
;
606 update_ref(reflog_orig_head
, "ORIG_HEAD", orig
, old_orig
, 0,
607 UPDATE_REFS_MSG_ON_ERR
);
609 delete_ref(NULL
, "ORIG_HEAD", old_orig
, 0);
611 strbuf_setlen(&msg
, prefix_len
);
612 strbuf_addstr(&msg
, "updating HEAD");
613 reflog_head
= msg
.buf
;
615 if (!switch_to_branch
)
616 ret
= update_ref(reflog_head
, "HEAD", oid
, orig
, REF_NO_DEREF
,
617 UPDATE_REFS_MSG_ON_ERR
);
619 ret
= create_symref("HEAD", switch_to_branch
, msg
.buf
);
621 ret
= update_ref(reflog_head
, "HEAD", oid
, NULL
, 0,
622 UPDATE_REFS_MSG_ON_ERR
);
625 strbuf_release(&msg
);
629 static int rebase_config(const char *var
, const char *value
, void *data
)
631 struct rebase_options
*opts
= data
;
633 if (!strcmp(var
, "rebase.stat")) {
634 if (git_config_bool(var
, value
))
635 opts
->flags
|= REBASE_DIFFSTAT
;
637 opts
->flags
&= !REBASE_DIFFSTAT
;
641 if (!strcmp(var
, "rebase.autosquash")) {
642 opts
->autosquash
= git_config_bool(var
, value
);
646 if (!strcmp(var
, "commit.gpgsign")) {
647 free(opts
->gpg_sign_opt
);
648 opts
->gpg_sign_opt
= git_config_bool(var
, value
) ?
649 xstrdup("-S") : NULL
;
653 if (!strcmp(var
, "rebase.autostash")) {
654 opts
->autostash
= git_config_bool(var
, value
);
658 return git_default_config(var
, value
, data
);
662 * Determines whether the commits in from..to are linear, i.e. contain
663 * no merge commits. This function *expects* `from` to be an ancestor of
666 static int is_linear_history(struct commit
*from
, struct commit
*to
)
668 while (to
&& to
!= from
) {
672 if (to
->parents
->next
)
674 to
= to
->parents
->item
;
679 static int can_fast_forward(struct commit
*onto
, struct object_id
*head_oid
,
680 struct object_id
*merge_base
)
682 struct commit
*head
= lookup_commit(the_repository
, head_oid
);
683 struct commit_list
*merge_bases
;
689 merge_bases
= get_merge_bases(onto
, head
);
690 if (merge_bases
&& !merge_bases
->next
) {
691 oidcpy(merge_base
, &merge_bases
->item
->object
.oid
);
692 res
= oideq(merge_base
, &onto
->object
.oid
);
694 oidcpy(merge_base
, &null_oid
);
697 free_commit_list(merge_bases
);
698 return res
&& is_linear_history(onto
, head
);
701 /* -i followed by -m is still -i */
702 static int parse_opt_merge(const struct option
*opt
, const char *arg
, int unset
)
704 struct rebase_options
*opts
= opt
->value
;
706 if (!is_interactive(opts
))
707 opts
->type
= REBASE_MERGE
;
712 /* -i followed by -p is still explicitly interactive, but -p alone is not */
713 static int parse_opt_interactive(const struct option
*opt
, const char *arg
,
716 struct rebase_options
*opts
= opt
->value
;
718 opts
->type
= REBASE_INTERACTIVE
;
719 opts
->flags
|= REBASE_INTERACTIVE_EXPLICIT
;
724 static void NORETURN
error_on_missing_default_upstream(void)
726 struct branch
*current_branch
= branch_get(NULL
);
729 "Please specify which branch you want to rebase against.\n"
730 "See git-rebase(1) for details.\n"
732 " git rebase '<branch>'\n"
734 current_branch
? _("There is no tracking information for "
735 "the current branch.") :
736 _("You are not currently on a branch."));
738 if (current_branch
) {
739 const char *remote
= current_branch
->remote_name
;
742 remote
= _("<remote>");
744 printf(_("If you wish to set tracking information for this "
745 "branch you can do so with:\n"
747 " git branch --set-upstream-to=%s/<branch> %s\n"
749 remote
, current_branch
->name
);
754 int cmd_rebase(int argc
, const char **argv
, const char *prefix
)
756 struct rebase_options options
= {
757 .type
= REBASE_UNSPECIFIED
,
758 .flags
= REBASE_NO_QUIET
,
759 .git_am_opt
= STRBUF_INIT
,
760 .allow_rerere_autoupdate
= -1,
761 .allow_empty_message
= 1,
762 .git_format_patch_opt
= STRBUF_INIT
,
764 const char *branch_name
;
765 int ret
, flags
, total_argc
, in_progress
= 0;
766 int ok_to_skip_pre_rebase
= 0;
767 struct strbuf msg
= STRBUF_INIT
;
768 struct strbuf revisions
= STRBUF_INIT
;
769 struct strbuf buf
= STRBUF_INIT
;
770 struct object_id merge_base
;
778 ACTION_SHOW_CURRENT_PATCH
,
779 } action
= NO_ACTION
;
780 int committer_date_is_author_date
= 0;
782 int ignore_whitespace
= 0;
783 const char *gpg_sign
= NULL
;
785 struct string_list whitespace
= STRING_LIST_INIT_NODUP
;
786 struct string_list exec
= STRING_LIST_INIT_NODUP
;
787 const char *rebase_merges
= NULL
;
789 struct string_list strategy_options
= STRING_LIST_INIT_NODUP
;
790 struct object_id squash_onto
;
791 char *squash_onto_name
= NULL
;
792 struct option builtin_rebase_options
[] = {
793 OPT_STRING(0, "onto", &options
.onto_name
,
795 N_("rebase onto given branch instead of upstream")),
796 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase
,
797 N_("allow pre-rebase hook to run")),
798 OPT_NEGBIT('q', "quiet", &options
.flags
,
799 N_("be quiet. implies --no-stat"),
800 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
801 OPT_BIT('v', "verbose", &options
.flags
,
802 N_("display a diffstat of what changed upstream"),
803 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
804 {OPTION_NEGBIT
, 'n', "no-stat", &options
.flags
, NULL
,
805 N_("do not show diffstat of what changed upstream"),
806 PARSE_OPT_NOARG
, NULL
, REBASE_DIFFSTAT
},
807 OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace
,
808 N_("passed to 'git apply'")),
809 OPT_BOOL(0, "signoff", &options
.signoff
,
810 N_("add a Signed-off-by: line to each commit")),
811 OPT_BOOL(0, "committer-date-is-author-date",
812 &committer_date_is_author_date
,
813 N_("passed to 'git am'")),
814 OPT_BOOL(0, "ignore-date", &ignore_date
,
815 N_("passed to 'git am'")),
816 OPT_BIT('f', "force-rebase", &options
.flags
,
817 N_("cherry-pick all commits, even if unchanged"),
819 OPT_BIT(0, "no-ff", &options
.flags
,
820 N_("cherry-pick all commits, even if unchanged"),
822 OPT_CMDMODE(0, "continue", &action
, N_("continue"),
824 OPT_CMDMODE(0, "skip", &action
,
825 N_("skip current patch and continue"), ACTION_SKIP
),
826 OPT_CMDMODE(0, "abort", &action
,
827 N_("abort and check out the original branch"),
829 OPT_CMDMODE(0, "quit", &action
,
830 N_("abort but keep HEAD where it is"), ACTION_QUIT
),
831 OPT_CMDMODE(0, "edit-todo", &action
, N_("edit the todo list "
832 "during an interactive rebase"), ACTION_EDIT_TODO
),
833 OPT_CMDMODE(0, "show-current-patch", &action
,
834 N_("show the patch file being applied or merged"),
835 ACTION_SHOW_CURRENT_PATCH
),
836 { OPTION_CALLBACK
, 'm', "merge", &options
, NULL
,
837 N_("use merging strategies to rebase"),
838 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
840 { OPTION_CALLBACK
, 'i', "interactive", &options
, NULL
,
841 N_("let the user edit the list of commits to rebase"),
842 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
843 parse_opt_interactive
},
844 OPT_SET_INT('p', "preserve-merges", &options
.type
,
845 N_("try to recreate merges instead of ignoring "
846 "them"), REBASE_PRESERVE_MERGES
),
847 OPT_BOOL(0, "rerere-autoupdate",
848 &options
.allow_rerere_autoupdate
,
849 N_("allow rerere to update index with resolved "
851 OPT_BOOL('k', "keep-empty", &options
.keep_empty
,
852 N_("preserve empty commits during rebase")),
853 OPT_BOOL(0, "autosquash", &options
.autosquash
,
854 N_("move commits that begin with "
855 "squash!/fixup! under -i")),
856 { OPTION_STRING
, 'S', "gpg-sign", &gpg_sign
, N_("key-id"),
857 N_("GPG-sign commits"),
858 PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
859 OPT_STRING_LIST(0, "whitespace", &whitespace
,
860 N_("whitespace"), N_("passed to 'git apply'")),
861 OPT_SET_INT('C', NULL
, &opt_c
, N_("passed to 'git apply'"),
863 OPT_BOOL(0, "autostash", &options
.autostash
,
864 N_("automatically stash/stash pop before and after")),
865 OPT_STRING_LIST('x', "exec", &exec
, N_("exec"),
866 N_("add exec lines after each commit of the "
868 OPT_BOOL(0, "allow-empty-message",
869 &options
.allow_empty_message
,
870 N_("allow rebasing commits with empty messages")),
871 {OPTION_STRING
, 'r', "rebase-merges", &rebase_merges
,
873 N_("try to rebase merges instead of skipping them"),
874 PARSE_OPT_OPTARG
, NULL
, (intptr_t)""},
875 OPT_BOOL(0, "fork-point", &fork_point
,
876 N_("use 'merge-base --fork-point' to refine upstream")),
877 OPT_STRING('s', "strategy", &options
.strategy
,
878 N_("strategy"), N_("use the given merge strategy")),
879 OPT_STRING_LIST('X', "strategy-option", &strategy_options
,
881 N_("pass the argument through to the merge "
883 OPT_BOOL(0, "root", &options
.root
,
884 N_("rebase all reachable commits up to the root(s)")),
889 * NEEDSWORK: Once the builtin rebase has been tested enough
890 * and git-legacy-rebase.sh is retired to contrib/, this preamble
894 if (!use_builtin_rebase()) {
895 const char *path
= mkpath("%s/git-legacy-rebase",
898 if (sane_execvp(path
, (char **)argv
) < 0)
899 die_errno(_("could not exec %s"), path
);
901 BUG("sane_execvp() returned???");
904 if (argc
== 2 && !strcmp(argv
[1], "-h"))
905 usage_with_options(builtin_rebase_usage
,
906 builtin_rebase_options
);
908 prefix
= setup_git_directory();
909 trace_repo_setup(prefix
);
912 git_config(rebase_config
, &options
);
915 strbuf_addf(&buf
, "%s/applying", apply_dir());
916 if(file_exists(buf
.buf
))
917 die(_("It looks like 'git am' is in progress. Cannot rebase."));
919 if (is_directory(apply_dir())) {
920 options
.type
= REBASE_AM
;
921 options
.state_dir
= apply_dir();
922 } else if (is_directory(merge_dir())) {
924 strbuf_addf(&buf
, "%s/rewritten", merge_dir());
925 if (is_directory(buf
.buf
)) {
926 options
.type
= REBASE_PRESERVE_MERGES
;
927 options
.flags
|= REBASE_INTERACTIVE_EXPLICIT
;
930 strbuf_addf(&buf
, "%s/interactive", merge_dir());
931 if(file_exists(buf
.buf
)) {
932 options
.type
= REBASE_INTERACTIVE
;
933 options
.flags
|= REBASE_INTERACTIVE_EXPLICIT
;
935 options
.type
= REBASE_MERGE
;
937 options
.state_dir
= merge_dir();
940 if (options
.type
!= REBASE_UNSPECIFIED
)
944 argc
= parse_options(argc
, argv
, prefix
,
945 builtin_rebase_options
,
946 builtin_rebase_usage
, 0);
948 if (action
!= NO_ACTION
&& total_argc
!= 2) {
949 usage_with_options(builtin_rebase_usage
,
950 builtin_rebase_options
);
954 usage_with_options(builtin_rebase_usage
,
955 builtin_rebase_options
);
957 if (action
!= NO_ACTION
&& !in_progress
)
958 die(_("No rebase in progress?"));
960 if (action
== ACTION_EDIT_TODO
&& !is_interactive(&options
))
961 die(_("The --edit-todo action can only be used during "
962 "interactive rebase."));
965 case ACTION_CONTINUE
: {
966 struct object_id head
;
967 struct lock_file lock_file
= LOCK_INIT
;
970 options
.action
= "continue";
973 if (get_oid("HEAD", &head
))
974 die(_("Cannot read HEAD"));
976 fd
= hold_locked_index(&lock_file
, 0);
977 if (read_index(the_repository
->index
) < 0)
978 die(_("could not read index"));
979 refresh_index(the_repository
->index
, REFRESH_QUIET
, NULL
, NULL
,
982 update_index_if_able(the_repository
->index
,
984 rollback_lock_file(&lock_file
);
986 if (has_unstaged_changes(1)) {
987 puts(_("You must edit all merge conflicts and then\n"
988 "mark them as resolved using git add"));
991 if (read_basic_state(&options
))
996 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
998 options
.action
= "skip";
1000 rerere_clear(&merge_rr
);
1001 string_list_clear(&merge_rr
, 1);
1003 if (reset_head(NULL
, "reset", NULL
, 0, NULL
, NULL
) < 0)
1004 die(_("could not discard worktree changes"));
1005 if (read_basic_state(&options
))
1009 case ACTION_ABORT
: {
1010 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1011 options
.action
= "abort";
1013 rerere_clear(&merge_rr
);
1014 string_list_clear(&merge_rr
, 1);
1016 if (read_basic_state(&options
))
1018 if (reset_head(&options
.orig_head
, "reset",
1019 options
.head_name
, 0, NULL
, NULL
) < 0)
1020 die(_("could not move back to %s"),
1021 oid_to_hex(&options
.orig_head
));
1022 ret
= finish_rebase(&options
);
1027 strbuf_addstr(&buf
, options
.state_dir
);
1028 ret
= !!remove_dir_recursively(&buf
, 0);
1030 die(_("could not remove '%s'"), options
.state_dir
);
1033 case ACTION_EDIT_TODO
:
1034 options
.action
= "edit-todo";
1035 options
.dont_finish_rebase
= 1;
1037 case ACTION_SHOW_CURRENT_PATCH
:
1038 options
.action
= "show-current-patch";
1039 options
.dont_finish_rebase
= 1;
1044 BUG("action: %d", action
);
1047 /* Make sure no rebase is in progress */
1049 const char *last_slash
= strrchr(options
.state_dir
, '/');
1050 const char *state_dir_base
=
1051 last_slash
? last_slash
+ 1 : options
.state_dir
;
1052 const char *cmd_live_rebase
=
1053 "git rebase (--continue | --abort | --skip)";
1055 strbuf_addf(&buf
, "rm -fr \"%s\"", options
.state_dir
);
1056 die(_("It seems that there is already a %s directory, and\n"
1057 "I wonder if you are in the middle of another rebase. "
1059 "case, please try\n\t%s\n"
1060 "If that is not the case, please\n\t%s\n"
1061 "and run me again. I am stopping in case you still "
1063 "valuable there.\n"),
1064 state_dir_base
, cmd_live_rebase
, buf
.buf
);
1067 if (!(options
.flags
& REBASE_NO_QUIET
))
1068 strbuf_addstr(&options
.git_am_opt
, " -q");
1070 if (committer_date_is_author_date
) {
1071 strbuf_addstr(&options
.git_am_opt
,
1072 " --committer-date-is-author-date");
1073 options
.flags
|= REBASE_FORCE
;
1076 if (ignore_whitespace
)
1077 strbuf_addstr(&options
.git_am_opt
, " --ignore-whitespace");
1080 strbuf_addstr(&options
.git_am_opt
, " --ignore-date");
1081 options
.flags
|= REBASE_FORCE
;
1084 if (options
.keep_empty
)
1085 imply_interactive(&options
, "--keep-empty");
1088 free(options
.gpg_sign_opt
);
1089 options
.gpg_sign_opt
= xstrfmt("-S%s", gpg_sign
);
1093 strbuf_addf(&options
.git_am_opt
, " -C%d", opt_c
);
1095 if (whitespace
.nr
) {
1098 for (i
= 0; i
< whitespace
.nr
; i
++) {
1099 const char *item
= whitespace
.items
[i
].string
;
1101 strbuf_addf(&options
.git_am_opt
, " --whitespace=%s",
1104 if ((!strcmp(item
, "fix")) || (!strcmp(item
, "strip")))
1105 options
.flags
|= REBASE_FORCE
;
1112 imply_interactive(&options
, "--exec");
1115 for (i
= 0; i
< exec
.nr
; i
++)
1116 strbuf_addf(&buf
, "exec %s\n", exec
.items
[i
].string
);
1117 options
.cmd
= xstrdup(buf
.buf
);
1120 if (rebase_merges
) {
1121 if (!*rebase_merges
)
1122 ; /* default mode; do nothing */
1123 else if (!strcmp("rebase-cousins", rebase_merges
))
1124 options
.rebase_cousins
= 1;
1125 else if (strcmp("no-rebase-cousins", rebase_merges
))
1126 die(_("Unknown mode: %s"), rebase_merges
);
1127 options
.rebase_merges
= 1;
1128 imply_interactive(&options
, "--rebase-merges");
1131 if (strategy_options
.nr
) {
1134 if (!options
.strategy
)
1135 options
.strategy
= "recursive";
1138 for (i
= 0; i
< strategy_options
.nr
; i
++)
1139 strbuf_addf(&buf
, " --%s",
1140 strategy_options
.items
[i
].string
);
1141 options
.strategy_opts
= xstrdup(buf
.buf
);
1144 if (options
.strategy
) {
1145 options
.strategy
= xstrdup(options
.strategy
);
1146 switch (options
.type
) {
1148 die(_("--strategy requires --merge or --interactive"));
1150 case REBASE_INTERACTIVE
:
1151 case REBASE_PRESERVE_MERGES
:
1154 case REBASE_UNSPECIFIED
:
1155 options
.type
= REBASE_MERGE
;
1158 BUG("unhandled rebase type (%d)", options
.type
);
1162 if (options
.root
&& !options
.onto_name
)
1163 imply_interactive(&options
, "--root without --onto");
1165 if (isatty(2) && options
.flags
& REBASE_NO_QUIET
)
1166 strbuf_addstr(&options
.git_format_patch_opt
, " --progress");
1168 switch (options
.type
) {
1170 case REBASE_INTERACTIVE
:
1171 case REBASE_PRESERVE_MERGES
:
1172 options
.state_dir
= merge_dir();
1175 options
.state_dir
= apply_dir();
1178 /* the default rebase backend is `--am` */
1179 options
.type
= REBASE_AM
;
1180 options
.state_dir
= apply_dir();
1184 if (options
.git_am_opt
.len
) {
1187 /* all am options except -q are compatible only with --am */
1189 strbuf_addbuf(&buf
, &options
.git_am_opt
);
1190 strbuf_addch(&buf
, ' ');
1191 while ((p
= strstr(buf
.buf
, " -q ")))
1192 strbuf_splice(&buf
, p
- buf
.buf
, 4, " ", 1);
1195 if (is_interactive(&options
) && buf
.len
)
1196 die(_("error: cannot combine interactive options "
1197 "(--interactive, --exec, --rebase-merges, "
1198 "--preserve-merges, --keep-empty, --root + "
1199 "--onto) with am options (%s)"), buf
.buf
);
1200 if (options
.type
== REBASE_MERGE
&& buf
.len
)
1201 die(_("error: cannot combine merge options (--merge, "
1202 "--strategy, --strategy-option) with am options "
1206 if (options
.signoff
) {
1207 if (options
.type
== REBASE_PRESERVE_MERGES
)
1208 die("cannot combine '--signoff' with "
1209 "'--preserve-merges'");
1210 strbuf_addstr(&options
.git_am_opt
, " --signoff");
1211 options
.flags
|= REBASE_FORCE
;
1214 if (options
.type
== REBASE_PRESERVE_MERGES
)
1216 * Note: incompatibility with --signoff handled in signoff block above
1217 * Note: incompatibility with --interactive is just a strong warning;
1218 * git-rebase.txt caveats with "unless you know what you are doing"
1220 if (options
.rebase_merges
)
1221 die(_("error: cannot combine '--preserve-merges' with "
1222 "'--rebase-merges'"));
1224 if (options
.rebase_merges
) {
1225 if (strategy_options
.nr
)
1226 die(_("error: cannot combine '--rebase-merges' with "
1227 "'--strategy-option'"));
1228 if (options
.strategy
)
1229 die(_("error: cannot combine '--rebase-merges' with "
1233 if (!options
.root
) {
1235 struct branch
*branch
;
1237 branch
= branch_get(NULL
);
1238 options
.upstream_name
= branch_get_upstream(branch
,
1240 if (!options
.upstream_name
)
1241 error_on_missing_default_upstream();
1245 options
.upstream_name
= argv
[0];
1248 if (!strcmp(options
.upstream_name
, "-"))
1249 options
.upstream_name
= "@{-1}";
1251 options
.upstream
= peel_committish(options
.upstream_name
);
1252 if (!options
.upstream
)
1253 die(_("invalid upstream '%s'"), options
.upstream_name
);
1254 options
.upstream_arg
= options
.upstream_name
;
1256 if (!options
.onto_name
) {
1257 if (commit_tree("", 0, the_hash_algo
->empty_tree
, NULL
,
1258 &squash_onto
, NULL
, NULL
) < 0)
1259 die(_("Could not create new root commit"));
1260 options
.squash_onto
= &squash_onto
;
1261 options
.onto_name
= squash_onto_name
=
1262 xstrdup(oid_to_hex(&squash_onto
));
1264 options
.upstream_name
= NULL
;
1265 options
.upstream
= NULL
;
1267 usage_with_options(builtin_rebase_usage
,
1268 builtin_rebase_options
);
1269 options
.upstream_arg
= "--root";
1272 /* Make sure the branch to rebase onto is valid. */
1273 if (!options
.onto_name
)
1274 options
.onto_name
= options
.upstream_name
;
1275 if (strstr(options
.onto_name
, "...")) {
1276 if (get_oid_mb(options
.onto_name
, &merge_base
) < 0)
1277 die(_("'%s': need exactly one merge base"),
1279 options
.onto
= lookup_commit_or_die(&merge_base
,
1282 options
.onto
= peel_committish(options
.onto_name
);
1284 die(_("Does not point to a valid commit '%s'"),
1289 * If the branch to rebase is given, that is the branch we will rebase
1290 * branch_name -- branch/commit being rebased, or
1291 * HEAD (already detached)
1292 * orig_head -- commit object name of tip of the branch before rebasing
1293 * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
1296 /* Is it "rebase other branchname" or "rebase other commit"? */
1297 branch_name
= argv
[0];
1298 options
.switch_to
= argv
[0];
1300 /* Is it a local branch? */
1302 strbuf_addf(&buf
, "refs/heads/%s", branch_name
);
1303 if (!read_ref(buf
.buf
, &options
.orig_head
))
1304 options
.head_name
= xstrdup(buf
.buf
);
1305 /* If not is it a valid ref (branch or commit)? */
1306 else if (!get_oid(branch_name
, &options
.orig_head
))
1307 options
.head_name
= NULL
;
1309 die(_("fatal: no such branch/commit '%s'"),
1311 } else if (argc
== 0) {
1312 /* Do not need to switch branches, we are already on it. */
1314 xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL
,
1316 if (!options
.head_name
)
1317 die(_("No such ref: %s"), "HEAD");
1318 if (flags
& REF_ISSYMREF
) {
1319 if (!skip_prefix(options
.head_name
,
1320 "refs/heads/", &branch_name
))
1321 branch_name
= options
.head_name
;
1324 free(options
.head_name
);
1325 options
.head_name
= NULL
;
1326 branch_name
= "HEAD";
1328 if (get_oid("HEAD", &options
.orig_head
))
1329 die(_("Could not resolve HEAD to a revision"));
1331 BUG("unexpected number of arguments left to parse");
1333 if (fork_point
> 0) {
1334 struct commit
*head
=
1335 lookup_commit_reference(the_repository
,
1336 &options
.orig_head
);
1337 options
.restrict_revision
=
1338 get_fork_point(options
.upstream_name
, head
);
1341 if (read_index(the_repository
->index
) < 0)
1342 die(_("could not read index"));
1344 if (options
.autostash
) {
1345 struct lock_file lock_file
= LOCK_INIT
;
1348 fd
= hold_locked_index(&lock_file
, 0);
1349 refresh_cache(REFRESH_QUIET
);
1351 update_index_if_able(&the_index
, &lock_file
);
1352 rollback_lock_file(&lock_file
);
1354 if (has_unstaged_changes(1) || has_uncommitted_changes(1)) {
1355 const char *autostash
=
1356 state_dir_path("autostash", &options
);
1357 struct child_process stash
= CHILD_PROCESS_INIT
;
1358 struct object_id oid
;
1359 struct commit
*head
=
1360 lookup_commit_reference(the_repository
,
1361 &options
.orig_head
);
1363 argv_array_pushl(&stash
.args
,
1364 "stash", "create", "autostash", NULL
);
1368 if (capture_command(&stash
, &buf
, GIT_MAX_HEXSZ
))
1369 die(_("Cannot autostash"));
1370 strbuf_trim_trailing_newline(&buf
);
1371 if (get_oid(buf
.buf
, &oid
))
1372 die(_("Unexpected stash response: '%s'"),
1375 strbuf_add_unique_abbrev(&buf
, &oid
, DEFAULT_ABBREV
);
1377 if (safe_create_leading_directories_const(autostash
))
1378 die(_("Could not create directory for '%s'"),
1380 write_file(autostash
, "%s", oid_to_hex(&oid
));
1381 printf(_("Created autostash: %s\n"), buf
.buf
);
1382 if (reset_head(&head
->object
.oid
, "reset --hard",
1383 NULL
, 0, NULL
, NULL
) < 0)
1384 die(_("could not reset --hard"));
1385 printf(_("HEAD is now at %s"),
1386 find_unique_abbrev(&head
->object
.oid
,
1389 pp_commit_easy(CMIT_FMT_ONELINE
, head
, &buf
);
1391 printf(" %s", buf
.buf
);
1394 if (discard_index(the_repository
->index
) < 0 ||
1395 read_index(the_repository
->index
) < 0)
1396 die(_("could not read index"));
1400 if (require_clean_work_tree("rebase",
1401 _("Please commit or stash them."), 1, 1)) {
1407 * Now we are rebasing commits upstream..orig_head (or with --root,
1408 * everything leading up to orig_head) on top of onto.
1412 * Check if we are already based on onto with linear history,
1413 * but this should be done only when upstream and onto are the same
1414 * and if this is not an interactive rebase.
1416 if (can_fast_forward(options
.onto
, &options
.orig_head
, &merge_base
) &&
1417 !is_interactive(&options
) && !options
.restrict_revision
&&
1419 !oidcmp(&options
.upstream
->object
.oid
, &options
.onto
->object
.oid
)) {
1422 if (!(options
.flags
& REBASE_FORCE
)) {
1423 /* Lazily switch to the target branch if needed... */
1424 if (options
.switch_to
) {
1425 struct object_id oid
;
1427 if (get_oid(options
.switch_to
, &oid
) < 0) {
1428 ret
= !!error(_("could not parse '%s'"),
1434 strbuf_addf(&buf
, "rebase: checkout %s",
1436 if (reset_head(&oid
, "checkout",
1437 options
.head_name
, 0,
1439 ret
= !!error(_("could not switch to "
1446 if (!(options
.flags
& REBASE_NO_QUIET
))
1448 else if (!strcmp(branch_name
, "HEAD") &&
1449 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1450 puts(_("HEAD is up to date."));
1452 printf(_("Current branch %s is up to date.\n"),
1454 ret
= !!finish_rebase(&options
);
1456 } else if (!(options
.flags
& REBASE_NO_QUIET
))
1458 else if (!strcmp(branch_name
, "HEAD") &&
1459 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1460 puts(_("HEAD is up to date, rebase forced."));
1462 printf(_("Current branch %s is up to date, rebase "
1463 "forced.\n"), branch_name
);
1466 /* If a hook exists, give it a chance to interrupt*/
1467 if (!ok_to_skip_pre_rebase
&&
1468 run_hook_le(NULL
, "pre-rebase", options
.upstream_arg
,
1469 argc
? argv
[0] : NULL
, NULL
))
1470 die(_("The pre-rebase hook refused to rebase."));
1472 if (options
.flags
& REBASE_DIFFSTAT
) {
1473 struct diff_options opts
;
1475 if (options
.flags
& REBASE_VERBOSE
)
1476 printf(_("Changes from %s to %s:\n"),
1477 oid_to_hex(&merge_base
),
1478 oid_to_hex(&options
.onto
->object
.oid
));
1480 /* We want color (if set), but no pager */
1482 opts
.stat_width
= -1; /* use full terminal width */
1483 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
1484 opts
.output_format
|=
1485 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
1486 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1487 diff_setup_done(&opts
);
1488 diff_tree_oid(&merge_base
, &options
.onto
->object
.oid
,
1490 diffcore_std(&opts
);
1494 if (is_interactive(&options
))
1497 /* Detach HEAD and reset the tree */
1498 if (options
.flags
& REBASE_NO_QUIET
)
1499 printf(_("First, rewinding head to replay your work on top of "
1502 strbuf_addf(&msg
, "rebase: checkout %s", options
.onto_name
);
1503 if (reset_head(&options
.onto
->object
.oid
, "checkout", NULL
, 1,
1505 die(_("Could not detach HEAD"));
1506 strbuf_release(&msg
);
1509 * If the onto is a proper descendant of the tip of the branch, then
1510 * we just fast-forwarded.
1513 if (!oidcmp(&merge_base
, &options
.orig_head
)) {
1514 printf(_("Fast-forwarded %s to %s. \n"),
1515 branch_name
, options
.onto_name
);
1516 strbuf_addf(&msg
, "rebase finished: %s onto %s",
1517 options
.head_name
? options
.head_name
: "detached HEAD",
1518 oid_to_hex(&options
.onto
->object
.oid
));
1519 reset_head(NULL
, "Fast-forwarded", options
.head_name
, 0,
1521 strbuf_release(&msg
);
1522 ret
= !!finish_rebase(&options
);
1526 strbuf_addf(&revisions
, "%s..%s",
1527 options
.root
? oid_to_hex(&options
.onto
->object
.oid
) :
1528 (options
.restrict_revision
?
1529 oid_to_hex(&options
.restrict_revision
->object
.oid
) :
1530 oid_to_hex(&options
.upstream
->object
.oid
)),
1531 oid_to_hex(&options
.orig_head
));
1533 options
.revisions
= revisions
.buf
;
1536 ret
= !!run_specific_rebase(&options
);
1539 strbuf_release(&revisions
);
1540 free(options
.head_name
);
1541 free(options
.gpg_sign_opt
);
1543 free(squash_onto_name
);