2 * "git rebase" builtin command
4 * Copyright (c) 2018 Pratik Karki
7 #define USE_THE_INDEX_COMPATIBILITY_MACROS
9 #include "run-command.h"
17 #include "cache-tree.h"
18 #include "unpack-trees.h"
20 #include "parse-options.h"
23 #include "wt-status.h"
25 #include "commit-reach.h"
28 #include "sequencer.h"
29 #include "rebase-interactive.h"
33 #define DEFAULT_REFLOG_ACTION "rebase"
35 static char const * const builtin_rebase_usage
[] = {
36 N_("git rebase [-i] [options] [--exec <cmd>] "
37 "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
38 N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
40 N_("git rebase --continue | --abort | --skip | --edit-todo"),
44 static GIT_PATH_FUNC(path_squash_onto
, "rebase-merge/squash-onto")
45 static GIT_PATH_FUNC(path_interactive
, "rebase-merge/interactive")
46 static GIT_PATH_FUNC(apply_dir
, "rebase-apply")
47 static GIT_PATH_FUNC(merge_dir
, "rebase-merge")
50 REBASE_UNSPECIFIED
= -1,
56 EMPTY_UNSPECIFIED
= -1,
62 struct rebase_options
{
63 enum rebase_type type
;
64 enum empty_type empty
;
65 const char *default_backend
;
66 const char *state_dir
;
67 struct commit
*upstream
;
68 const char *upstream_name
;
69 const char *upstream_arg
;
71 struct object_id orig_head
;
73 const char *onto_name
;
74 const char *revisions
;
75 const char *switch_to
;
76 int root
, root_with_onto
;
77 struct object_id
*squash_onto
;
78 struct commit
*restrict_revision
;
79 int dont_finish_rebase
;
81 REBASE_NO_QUIET
= 1<<0,
82 REBASE_VERBOSE
= 1<<1,
83 REBASE_DIFFSTAT
= 1<<2,
85 REBASE_INTERACTIVE_EXPLICIT
= 1<<4,
87 struct strvec git_am_opts
;
90 int allow_rerere_autoupdate
;
95 int committer_date_is_author_date
;
98 int allow_empty_message
;
99 int rebase_merges
, rebase_cousins
;
100 char *strategy
, *strategy_opts
;
101 struct strbuf git_format_patch_opt
;
102 int reschedule_failed_exec
;
103 int reapply_cherry_picks
;
107 #define REBASE_OPTIONS_INIT { \
108 .type = REBASE_UNSPECIFIED, \
109 .empty = EMPTY_UNSPECIFIED, \
111 .default_backend = "merge", \
112 .flags = REBASE_NO_QUIET, \
113 .git_am_opts = STRVEC_INIT, \
114 .git_format_patch_opt = STRBUF_INIT, \
118 static struct replay_opts
get_replay_opts(const struct rebase_options
*opts
)
120 struct replay_opts replay
= REPLAY_OPTS_INIT
;
122 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
123 replay
.strategy
= NULL
;
124 sequencer_init_config(&replay
);
126 replay
.signoff
= opts
->signoff
;
127 replay
.allow_ff
= !(opts
->flags
& REBASE_FORCE
);
128 if (opts
->allow_rerere_autoupdate
)
129 replay
.allow_rerere_auto
= opts
->allow_rerere_autoupdate
;
130 replay
.allow_empty
= 1;
131 replay
.allow_empty_message
= opts
->allow_empty_message
;
132 replay
.drop_redundant_commits
= (opts
->empty
== EMPTY_DROP
);
133 replay
.keep_redundant_commits
= (opts
->empty
== EMPTY_KEEP
);
134 replay
.quiet
= !(opts
->flags
& REBASE_NO_QUIET
);
135 replay
.verbose
= opts
->flags
& REBASE_VERBOSE
;
136 replay
.reschedule_failed_exec
= opts
->reschedule_failed_exec
;
137 replay
.committer_date_is_author_date
=
138 opts
->committer_date_is_author_date
;
139 replay
.ignore_date
= opts
->ignore_date
;
140 replay
.gpg_sign
= xstrdup_or_null(opts
->gpg_sign_opt
);
142 replay
.strategy
= xstrdup_or_null(opts
->strategy
);
143 else if (!replay
.strategy
&& replay
.default_strategy
) {
144 replay
.strategy
= replay
.default_strategy
;
145 replay
.default_strategy
= NULL
;
148 if (opts
->strategy_opts
)
149 parse_strategy_opts(&replay
, opts
->strategy_opts
);
151 if (opts
->squash_onto
) {
152 oidcpy(&replay
.squash_onto
, opts
->squash_onto
);
153 replay
.have_squash_onto
= 1;
166 ACTION_SHOW_CURRENT_PATCH
169 static const char *action_names
[] = { "undefined",
175 "show_current_patch" };
177 static int edit_todo_file(unsigned flags
)
179 const char *todo_file
= rebase_path_todo();
180 struct todo_list todo_list
= TODO_LIST_INIT
,
181 new_todo
= TODO_LIST_INIT
;
184 if (strbuf_read_file(&todo_list
.buf
, todo_file
, 0) < 0)
185 return error_errno(_("could not read '%s'."), todo_file
);
187 strbuf_stripspace(&todo_list
.buf
, 1);
188 res
= edit_todo_list(the_repository
, &todo_list
, &new_todo
, NULL
, NULL
, flags
);
189 if (!res
&& todo_list_write_to_file(the_repository
, &new_todo
, todo_file
,
190 NULL
, NULL
, -1, flags
& ~(TODO_LIST_SHORTEN_IDS
)))
191 res
= error_errno(_("could not write '%s'"), todo_file
);
193 todo_list_release(&todo_list
);
194 todo_list_release(&new_todo
);
199 static int get_revision_ranges(struct commit
*upstream
, struct commit
*onto
,
200 struct object_id
*orig_head
, char **revisions
,
201 char **shortrevisions
)
203 struct commit
*base_rev
= upstream
? upstream
: onto
;
204 const char *shorthead
;
206 *revisions
= xstrfmt("%s...%s", oid_to_hex(&base_rev
->object
.oid
),
207 oid_to_hex(orig_head
));
209 shorthead
= find_unique_abbrev(orig_head
, DEFAULT_ABBREV
);
212 const char *shortrev
;
214 shortrev
= find_unique_abbrev(&base_rev
->object
.oid
,
217 *shortrevisions
= xstrfmt("%s..%s", shortrev
, shorthead
);
219 *shortrevisions
= xstrdup(shorthead
);
224 static int init_basic_state(struct replay_opts
*opts
, const char *head_name
,
226 const struct object_id
*orig_head
)
230 if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
231 return error_errno(_("could not create temporary %s"), merge_dir());
233 delete_reflog("REBASE_HEAD");
235 interactive
= fopen(path_interactive(), "w");
237 return error_errno(_("could not mark as interactive"));
240 return write_basic_state(opts
, head_name
, onto
, orig_head
);
243 static void split_exec_commands(const char *cmd
, struct string_list
*commands
)
246 string_list_split(commands
, cmd
, '\n', -1);
248 /* rebase.c adds a new line to cmd after every command,
249 * so here the last command is always empty */
250 string_list_remove_empty_items(commands
, 0);
254 static int do_interactive_rebase(struct rebase_options
*opts
, unsigned flags
)
257 char *revisions
= NULL
, *shortrevisions
= NULL
;
258 struct strvec make_script_args
= STRVEC_INIT
;
259 struct todo_list todo_list
= TODO_LIST_INIT
;
260 struct replay_opts replay
= get_replay_opts(opts
);
261 struct string_list commands
= STRING_LIST_INIT_DUP
;
263 if (get_revision_ranges(opts
->upstream
, opts
->onto
, &opts
->orig_head
,
264 &revisions
, &shortrevisions
))
267 if (init_basic_state(&replay
,
268 opts
->head_name
? opts
->head_name
: "detached HEAD",
269 opts
->onto
, &opts
->orig_head
)) {
271 free(shortrevisions
);
276 if (!opts
->upstream
&& opts
->squash_onto
)
277 write_file(path_squash_onto(), "%s\n",
278 oid_to_hex(opts
->squash_onto
));
280 strvec_pushl(&make_script_args
, "", revisions
, NULL
);
281 if (opts
->restrict_revision
)
282 strvec_pushf(&make_script_args
, "^%s",
283 oid_to_hex(&opts
->restrict_revision
->object
.oid
));
285 ret
= sequencer_make_script(the_repository
, &todo_list
.buf
,
286 make_script_args
.nr
, make_script_args
.v
,
290 error(_("could not generate todo list"));
293 if (todo_list_parse_insn_buffer(the_repository
, todo_list
.buf
.buf
,
295 BUG("unusable todo list");
297 split_exec_commands(opts
->cmd
, &commands
);
298 ret
= complete_action(the_repository
, &replay
, flags
,
299 shortrevisions
, opts
->onto_name
, opts
->onto
,
300 &opts
->orig_head
, &commands
, opts
->autosquash
,
304 string_list_clear(&commands
, 0);
306 free(shortrevisions
);
307 todo_list_release(&todo_list
);
308 strvec_clear(&make_script_args
);
313 static int run_sequencer_rebase(struct rebase_options
*opts
,
317 int abbreviate_commands
= 0, ret
= 0;
319 git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands
);
321 flags
|= opts
->keep_empty
? TODO_LIST_KEEP_EMPTY
: 0;
322 flags
|= abbreviate_commands
? TODO_LIST_ABBREVIATE_CMDS
: 0;
323 flags
|= opts
->rebase_merges
? TODO_LIST_REBASE_MERGES
: 0;
324 flags
|= opts
->rebase_cousins
> 0 ? TODO_LIST_REBASE_COUSINS
: 0;
325 flags
|= opts
->root_with_onto
? TODO_LIST_ROOT_WITH_ONTO
: 0;
326 flags
|= opts
->reapply_cherry_picks
? TODO_LIST_REAPPLY_CHERRY_PICKS
: 0;
327 flags
|= opts
->flags
& REBASE_NO_QUIET
? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS
: 0;
331 if (!opts
->onto
&& !opts
->upstream
)
332 die(_("a base commit must be provided with --upstream or --onto"));
334 ret
= do_interactive_rebase(opts
, flags
);
338 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
340 rerere_clear(the_repository
, &merge_rr
);
343 case ACTION_CONTINUE
: {
344 struct replay_opts replay_opts
= get_replay_opts(opts
);
346 ret
= sequencer_continue(the_repository
, &replay_opts
);
349 case ACTION_EDIT_TODO
:
350 ret
= edit_todo_file(flags
);
352 case ACTION_SHOW_CURRENT_PATCH
: {
353 struct child_process cmd
= CHILD_PROCESS_INIT
;
356 strvec_pushl(&cmd
.args
, "show", "REBASE_HEAD", "--", NULL
);
357 ret
= run_command(&cmd
);
362 BUG("invalid command '%d'", command
);
368 static void imply_merge(struct rebase_options
*opts
, const char *option
);
369 static int parse_opt_keep_empty(const struct option
*opt
, const char *arg
,
372 struct rebase_options
*opts
= opt
->value
;
376 imply_merge(opts
, unset
? "--no-keep-empty" : "--keep-empty");
377 opts
->keep_empty
= !unset
;
378 opts
->type
= REBASE_MERGE
;
382 static int is_merge(struct rebase_options
*opts
)
384 return opts
->type
== REBASE_MERGE
;
387 static void imply_merge(struct rebase_options
*opts
, const char *option
)
389 switch (opts
->type
) {
391 die(_("%s requires the merge backend"), option
);
396 opts
->type
= REBASE_MERGE
; /* implied */
401 /* Returns the filename prefixed by the state_dir */
402 static const char *state_dir_path(const char *filename
, struct rebase_options
*opts
)
404 static struct strbuf path
= STRBUF_INIT
;
405 static size_t prefix_len
;
408 strbuf_addf(&path
, "%s/", opts
->state_dir
);
409 prefix_len
= path
.len
;
412 strbuf_setlen(&path
, prefix_len
);
413 strbuf_addstr(&path
, filename
);
417 /* Initialize the rebase options from the state directory. */
418 static int read_basic_state(struct rebase_options
*opts
)
420 struct strbuf head_name
= STRBUF_INIT
;
421 struct strbuf buf
= STRBUF_INIT
;
422 struct object_id oid
;
424 if (!read_oneliner(&head_name
, state_dir_path("head-name", opts
),
425 READ_ONELINER_WARN_MISSING
) ||
426 !read_oneliner(&buf
, state_dir_path("onto", opts
),
427 READ_ONELINER_WARN_MISSING
))
429 opts
->head_name
= starts_with(head_name
.buf
, "refs/") ?
430 xstrdup(head_name
.buf
) : NULL
;
431 strbuf_release(&head_name
);
432 if (get_oid(buf
.buf
, &oid
))
433 return error(_("could not get 'onto': '%s'"), buf
.buf
);
434 opts
->onto
= lookup_commit_or_die(&oid
, buf
.buf
);
437 * We always write to orig-head, but interactive rebase used to write to
438 * head. Fall back to reading from head to cover for the case that the
439 * user upgraded git with an ongoing interactive rebase.
442 if (file_exists(state_dir_path("orig-head", opts
))) {
443 if (!read_oneliner(&buf
, state_dir_path("orig-head", opts
),
444 READ_ONELINER_WARN_MISSING
))
446 } else if (!read_oneliner(&buf
, state_dir_path("head", opts
),
447 READ_ONELINER_WARN_MISSING
))
449 if (get_oid(buf
.buf
, &opts
->orig_head
))
450 return error(_("invalid orig-head: '%s'"), buf
.buf
);
452 if (file_exists(state_dir_path("quiet", opts
)))
453 opts
->flags
&= ~REBASE_NO_QUIET
;
455 opts
->flags
|= REBASE_NO_QUIET
;
457 if (file_exists(state_dir_path("verbose", opts
)))
458 opts
->flags
|= REBASE_VERBOSE
;
460 if (file_exists(state_dir_path("signoff", opts
))) {
462 opts
->flags
|= REBASE_FORCE
;
465 if (file_exists(state_dir_path("allow_rerere_autoupdate", opts
))) {
467 if (!read_oneliner(&buf
, state_dir_path("allow_rerere_autoupdate", opts
),
468 READ_ONELINER_WARN_MISSING
))
470 if (!strcmp(buf
.buf
, "--rerere-autoupdate"))
471 opts
->allow_rerere_autoupdate
= RERERE_AUTOUPDATE
;
472 else if (!strcmp(buf
.buf
, "--no-rerere-autoupdate"))
473 opts
->allow_rerere_autoupdate
= RERERE_NOAUTOUPDATE
;
475 warning(_("ignoring invalid allow_rerere_autoupdate: "
479 if (file_exists(state_dir_path("gpg_sign_opt", opts
))) {
481 if (!read_oneliner(&buf
, state_dir_path("gpg_sign_opt", opts
),
482 READ_ONELINER_WARN_MISSING
))
484 free(opts
->gpg_sign_opt
);
485 opts
->gpg_sign_opt
= xstrdup(buf
.buf
);
488 if (file_exists(state_dir_path("strategy", opts
))) {
490 if (!read_oneliner(&buf
, state_dir_path("strategy", opts
),
491 READ_ONELINER_WARN_MISSING
))
493 free(opts
->strategy
);
494 opts
->strategy
= xstrdup(buf
.buf
);
497 if (file_exists(state_dir_path("strategy_opts", opts
))) {
499 if (!read_oneliner(&buf
, state_dir_path("strategy_opts", opts
),
500 READ_ONELINER_WARN_MISSING
))
502 free(opts
->strategy_opts
);
503 opts
->strategy_opts
= xstrdup(buf
.buf
);
506 strbuf_release(&buf
);
511 static int rebase_write_basic_state(struct rebase_options
*opts
)
513 write_file(state_dir_path("head-name", opts
), "%s",
514 opts
->head_name
? opts
->head_name
: "detached HEAD");
515 write_file(state_dir_path("onto", opts
), "%s",
516 opts
->onto
? oid_to_hex(&opts
->onto
->object
.oid
) : "");
517 write_file(state_dir_path("orig-head", opts
), "%s",
518 oid_to_hex(&opts
->orig_head
));
519 if (!(opts
->flags
& REBASE_NO_QUIET
))
520 write_file(state_dir_path("quiet", opts
), "%s", "");
521 if (opts
->flags
& REBASE_VERBOSE
)
522 write_file(state_dir_path("verbose", opts
), "%s", "");
524 write_file(state_dir_path("strategy", opts
), "%s",
526 if (opts
->strategy_opts
)
527 write_file(state_dir_path("strategy_opts", opts
), "%s",
528 opts
->strategy_opts
);
529 if (opts
->allow_rerere_autoupdate
> 0)
530 write_file(state_dir_path("allow_rerere_autoupdate", opts
),
531 "-%s-rerere-autoupdate",
532 opts
->allow_rerere_autoupdate
== RERERE_AUTOUPDATE
?
534 if (opts
->gpg_sign_opt
)
535 write_file(state_dir_path("gpg_sign_opt", opts
), "%s",
538 write_file(state_dir_path("signoff", opts
), "--signoff");
543 static int finish_rebase(struct rebase_options
*opts
)
545 struct strbuf dir
= STRBUF_INIT
;
548 delete_ref(NULL
, "REBASE_HEAD", NULL
, REF_NO_DEREF
);
549 unlink(git_path_auto_merge(the_repository
));
550 apply_autostash(state_dir_path("autostash", opts
));
552 * We ignore errors in 'git maintenance run --auto', since the
553 * user should see them.
555 run_auto_maintenance(!(opts
->flags
& (REBASE_NO_QUIET
|REBASE_VERBOSE
)));
556 if (opts
->type
== REBASE_MERGE
) {
557 struct replay_opts replay
= REPLAY_OPTS_INIT
;
559 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
560 ret
= sequencer_remove_state(&replay
);
562 strbuf_addstr(&dir
, opts
->state_dir
);
563 if (remove_dir_recursively(&dir
, 0))
564 ret
= error(_("could not remove '%s'"),
566 strbuf_release(&dir
);
572 static int move_to_original_branch(struct rebase_options
*opts
)
574 struct strbuf branch_reflog
= STRBUF_INIT
, head_reflog
= STRBUF_INIT
;
575 struct reset_head_opts ropts
= { 0 };
578 if (!opts
->head_name
)
579 return 0; /* nothing to move back to */
582 BUG("move_to_original_branch without onto");
584 strbuf_addf(&branch_reflog
, "rebase finished: %s onto %s",
585 opts
->head_name
, oid_to_hex(&opts
->onto
->object
.oid
));
586 strbuf_addf(&head_reflog
, "rebase finished: returning to %s",
588 ropts
.branch
= opts
->head_name
;
589 ropts
.flags
= RESET_HEAD_REFS_ONLY
;
590 ropts
.branch_msg
= branch_reflog
.buf
;
591 ropts
.head_msg
= head_reflog
.buf
;
592 ret
= reset_head(the_repository
, &ropts
);
594 strbuf_release(&branch_reflog
);
595 strbuf_release(&head_reflog
);
599 static const char *resolvemsg
=
600 N_("Resolve all conflicts manually, mark them as resolved with\n"
601 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
602 "You can instead skip this commit: run \"git rebase --skip\".\n"
603 "To abort and get back to the state before \"git rebase\", run "
604 "\"git rebase --abort\".");
606 static int run_am(struct rebase_options
*opts
)
608 struct child_process am
= CHILD_PROCESS_INIT
;
609 struct child_process format_patch
= CHILD_PROCESS_INIT
;
610 struct strbuf revisions
= STRBUF_INIT
;
612 char *rebased_patches
;
615 strvec_push(&am
.args
, "am");
617 if (opts
->action
&& !strcmp("continue", opts
->action
)) {
618 strvec_push(&am
.args
, "--resolved");
619 strvec_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
620 if (opts
->gpg_sign_opt
)
621 strvec_push(&am
.args
, opts
->gpg_sign_opt
);
622 status
= run_command(&am
);
626 return move_to_original_branch(opts
);
628 if (opts
->action
&& !strcmp("skip", opts
->action
)) {
629 strvec_push(&am
.args
, "--skip");
630 strvec_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
631 status
= run_command(&am
);
635 return move_to_original_branch(opts
);
637 if (opts
->action
&& !strcmp("show-current-patch", opts
->action
)) {
638 strvec_push(&am
.args
, "--show-current-patch");
639 return run_command(&am
);
642 strbuf_addf(&revisions
, "%s...%s",
643 oid_to_hex(opts
->root
?
644 /* this is now equivalent to !opts->upstream */
645 &opts
->onto
->object
.oid
:
646 &opts
->upstream
->object
.oid
),
647 oid_to_hex(&opts
->orig_head
));
649 rebased_patches
= xstrdup(git_path("rebased-patches"));
650 format_patch
.out
= open(rebased_patches
,
651 O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
652 if (format_patch
.out
< 0) {
653 status
= error_errno(_("could not open '%s' for writing"),
655 free(rebased_patches
);
656 strvec_clear(&am
.args
);
660 format_patch
.git_cmd
= 1;
661 strvec_pushl(&format_patch
.args
, "format-patch", "-k", "--stdout",
662 "--full-index", "--cherry-pick", "--right-only",
663 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
664 "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
666 if (opts
->git_format_patch_opt
.len
)
667 strvec_split(&format_patch
.args
,
668 opts
->git_format_patch_opt
.buf
);
669 strvec_push(&format_patch
.args
, revisions
.buf
);
670 if (opts
->restrict_revision
)
671 strvec_pushf(&format_patch
.args
, "^%s",
672 oid_to_hex(&opts
->restrict_revision
->object
.oid
));
674 status
= run_command(&format_patch
);
676 struct reset_head_opts ropts
= { 0 };
677 unlink(rebased_patches
);
678 free(rebased_patches
);
679 strvec_clear(&am
.args
);
681 ropts
.oid
= &opts
->orig_head
;
682 ropts
.branch
= opts
->head_name
;
683 ropts
.default_reflog_action
= DEFAULT_REFLOG_ACTION
;
684 reset_head(the_repository
, &ropts
);
685 error(_("\ngit encountered an error while preparing the "
686 "patches to replay\n"
689 "As a result, git cannot rebase them."),
692 strbuf_release(&revisions
);
695 strbuf_release(&revisions
);
697 am
.in
= open(rebased_patches
, O_RDONLY
);
699 status
= error_errno(_("could not open '%s' for reading"),
701 free(rebased_patches
);
702 strvec_clear(&am
.args
);
706 strvec_pushv(&am
.args
, opts
->git_am_opts
.v
);
707 strvec_push(&am
.args
, "--rebasing");
708 strvec_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
709 strvec_push(&am
.args
, "--patch-format=mboxrd");
710 if (opts
->allow_rerere_autoupdate
== RERERE_AUTOUPDATE
)
711 strvec_push(&am
.args
, "--rerere-autoupdate");
712 else if (opts
->allow_rerere_autoupdate
== RERERE_NOAUTOUPDATE
)
713 strvec_push(&am
.args
, "--no-rerere-autoupdate");
714 if (opts
->gpg_sign_opt
)
715 strvec_push(&am
.args
, opts
->gpg_sign_opt
);
716 status
= run_command(&am
);
717 unlink(rebased_patches
);
718 free(rebased_patches
);
721 return move_to_original_branch(opts
);
724 if (is_directory(opts
->state_dir
))
725 rebase_write_basic_state(opts
);
730 static int run_specific_rebase(struct rebase_options
*opts
, enum action action
)
734 if (opts
->type
== REBASE_MERGE
) {
735 /* Run sequencer-based rebase */
736 setenv("GIT_CHERRY_PICK_HELP", resolvemsg
, 1);
737 if (!(opts
->flags
& REBASE_INTERACTIVE_EXPLICIT
)) {
738 setenv("GIT_SEQUENCE_EDITOR", ":", 1);
739 opts
->autosquash
= 0;
741 if (opts
->gpg_sign_opt
) {
742 /* remove the leading "-S" */
743 char *tmp
= xstrdup(opts
->gpg_sign_opt
+ 2);
744 free(opts
->gpg_sign_opt
);
745 opts
->gpg_sign_opt
= tmp
;
748 status
= run_sequencer_rebase(opts
, action
);
749 } else if (opts
->type
== REBASE_APPLY
)
750 status
= run_am(opts
);
752 BUG("Unhandled rebase type %d", opts
->type
);
754 if (opts
->dont_finish_rebase
)
756 else if (opts
->type
== REBASE_MERGE
)
757 ; /* merge backend cleans up after itself */
758 else if (status
== 0) {
759 if (!file_exists(state_dir_path("stopped-sha", opts
)))
761 } else if (status
== 2) {
762 struct strbuf dir
= STRBUF_INIT
;
764 apply_autostash(state_dir_path("autostash", opts
));
765 strbuf_addstr(&dir
, opts
->state_dir
);
766 remove_dir_recursively(&dir
, 0);
767 strbuf_release(&dir
);
768 die("Nothing to do");
771 return status
? -1 : 0;
774 static int rebase_config(const char *var
, const char *value
, void *data
)
776 struct rebase_options
*opts
= data
;
778 if (!strcmp(var
, "rebase.stat")) {
779 if (git_config_bool(var
, value
))
780 opts
->flags
|= REBASE_DIFFSTAT
;
782 opts
->flags
&= ~REBASE_DIFFSTAT
;
786 if (!strcmp(var
, "rebase.autosquash")) {
787 opts
->autosquash
= git_config_bool(var
, value
);
791 if (!strcmp(var
, "commit.gpgsign")) {
792 free(opts
->gpg_sign_opt
);
793 opts
->gpg_sign_opt
= git_config_bool(var
, value
) ?
794 xstrdup("-S") : NULL
;
798 if (!strcmp(var
, "rebase.autostash")) {
799 opts
->autostash
= git_config_bool(var
, value
);
803 if (!strcmp(var
, "rebase.reschedulefailedexec")) {
804 opts
->reschedule_failed_exec
= git_config_bool(var
, value
);
808 if (!strcmp(var
, "rebase.forkpoint")) {
809 opts
->fork_point
= git_config_bool(var
, value
) ? -1 : 0;
813 if (!strcmp(var
, "rebase.backend")) {
814 return git_config_string(&opts
->default_backend
, var
, value
);
817 return git_default_config(var
, value
, data
);
820 static int checkout_up_to_date(struct rebase_options
*options
)
822 struct strbuf buf
= STRBUF_INIT
;
823 struct reset_head_opts ropts
= { 0 };
826 strbuf_addf(&buf
, "%s: checkout %s",
827 getenv(GIT_REFLOG_ACTION_ENVIRONMENT
),
829 ropts
.oid
= &options
->orig_head
;
830 ropts
.branch
= options
->head_name
;
831 ropts
.flags
= RESET_HEAD_RUN_POST_CHECKOUT_HOOK
;
832 ropts
.head_msg
= buf
.buf
;
833 if (reset_head(the_repository
, &ropts
) < 0)
834 ret
= error(_("could not switch to %s"), options
->switch_to
);
835 strbuf_release(&buf
);
841 * Determines whether the commits in from..to are linear, i.e. contain
842 * no merge commits. This function *expects* `from` to be an ancestor of
845 static int is_linear_history(struct commit
*from
, struct commit
*to
)
847 while (to
&& to
!= from
) {
851 if (to
->parents
->next
)
853 to
= to
->parents
->item
;
858 static int can_fast_forward(struct commit
*onto
, struct commit
*upstream
,
859 struct commit
*restrict_revision
,
860 struct object_id
*head_oid
, struct object_id
*merge_base
)
862 struct commit
*head
= lookup_commit(the_repository
, head_oid
);
863 struct commit_list
*merge_bases
= NULL
;
869 merge_bases
= get_merge_bases(onto
, head
);
870 if (!merge_bases
|| merge_bases
->next
) {
871 oidcpy(merge_base
, null_oid());
875 oidcpy(merge_base
, &merge_bases
->item
->object
.oid
);
876 if (!oideq(merge_base
, &onto
->object
.oid
))
879 if (restrict_revision
&& !oideq(&restrict_revision
->object
.oid
, merge_base
))
885 free_commit_list(merge_bases
);
886 merge_bases
= get_merge_bases(upstream
, head
);
887 if (!merge_bases
|| merge_bases
->next
)
890 if (!oideq(&onto
->object
.oid
, &merge_bases
->item
->object
.oid
))
896 free_commit_list(merge_bases
);
897 return res
&& is_linear_history(onto
, head
);
900 static int parse_opt_am(const struct option
*opt
, const char *arg
, int unset
)
902 struct rebase_options
*opts
= opt
->value
;
904 BUG_ON_OPT_NEG(unset
);
907 opts
->type
= REBASE_APPLY
;
912 /* -i followed by -m is still -i */
913 static int parse_opt_merge(const struct option
*opt
, const char *arg
, int unset
)
915 struct rebase_options
*opts
= opt
->value
;
917 BUG_ON_OPT_NEG(unset
);
921 opts
->type
= REBASE_MERGE
;
926 /* -i followed by -r is still explicitly interactive, but -r alone is not */
927 static int parse_opt_interactive(const struct option
*opt
, const char *arg
,
930 struct rebase_options
*opts
= opt
->value
;
932 BUG_ON_OPT_NEG(unset
);
935 opts
->type
= REBASE_MERGE
;
936 opts
->flags
|= REBASE_INTERACTIVE_EXPLICIT
;
941 static enum empty_type
parse_empty_value(const char *value
)
943 if (!strcasecmp(value
, "drop"))
945 else if (!strcasecmp(value
, "keep"))
947 else if (!strcasecmp(value
, "ask"))
950 die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value
);
953 static int parse_opt_empty(const struct option
*opt
, const char *arg
, int unset
)
955 struct rebase_options
*options
= opt
->value
;
956 enum empty_type value
= parse_empty_value(arg
);
958 BUG_ON_OPT_NEG(unset
);
960 options
->empty
= value
;
964 static void NORETURN
error_on_missing_default_upstream(void)
966 struct branch
*current_branch
= branch_get(NULL
);
969 "Please specify which branch you want to rebase against.\n"
970 "See git-rebase(1) for details.\n"
972 " git rebase '<branch>'\n"
974 current_branch
? _("There is no tracking information for "
975 "the current branch.") :
976 _("You are not currently on a branch."));
978 if (current_branch
) {
979 const char *remote
= current_branch
->remote_name
;
982 remote
= _("<remote>");
984 printf(_("If you wish to set tracking information for this "
985 "branch you can do so with:\n"
987 " git branch --set-upstream-to=%s/<branch> %s\n"
989 remote
, current_branch
->name
);
994 static void set_reflog_action(struct rebase_options
*options
)
997 struct strbuf buf
= STRBUF_INIT
;
999 if (!is_merge(options
))
1002 env
= getenv(GIT_REFLOG_ACTION_ENVIRONMENT
);
1003 if (env
&& strcmp("rebase", env
))
1004 return; /* only override it if it is "rebase" */
1006 strbuf_addf(&buf
, "rebase (%s)", options
->action
);
1007 setenv(GIT_REFLOG_ACTION_ENVIRONMENT
, buf
.buf
, 1);
1008 strbuf_release(&buf
);
1011 static int check_exec_cmd(const char *cmd
)
1013 if (strchr(cmd
, '\n'))
1014 return error(_("exec commands cannot contain newlines"));
1016 /* Does the command consist purely of whitespace? */
1017 if (!cmd
[strspn(cmd
, " \t\r\f\v")])
1018 return error(_("empty exec command"));
1023 int cmd_rebase(int argc
, const char **argv
, const char *prefix
)
1025 struct rebase_options options
= REBASE_OPTIONS_INIT
;
1026 const char *branch_name
;
1027 int ret
, flags
, total_argc
, in_progress
= 0;
1029 int ok_to_skip_pre_rebase
= 0;
1030 struct strbuf msg
= STRBUF_INIT
;
1031 struct strbuf revisions
= STRBUF_INIT
;
1032 struct strbuf buf
= STRBUF_INIT
;
1033 struct object_id merge_base
;
1034 int ignore_whitespace
= 0;
1035 enum action action
= ACTION_NONE
;
1036 const char *gpg_sign
= NULL
;
1037 struct string_list exec
= STRING_LIST_INIT_NODUP
;
1038 const char *rebase_merges
= NULL
;
1039 struct string_list strategy_options
= STRING_LIST_INIT_NODUP
;
1040 struct object_id squash_onto
;
1041 char *squash_onto_name
= NULL
;
1042 int reschedule_failed_exec
= -1;
1043 int allow_preemptive_ff
= 1;
1044 int preserve_merges_selected
= 0;
1045 struct reset_head_opts ropts
= { 0 };
1046 struct option builtin_rebase_options
[] = {
1047 OPT_STRING(0, "onto", &options
.onto_name
,
1049 N_("rebase onto given branch instead of upstream")),
1050 OPT_BOOL(0, "keep-base", &keep_base
,
1051 N_("use the merge-base of upstream and branch as the current base")),
1052 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase
,
1053 N_("allow pre-rebase hook to run")),
1054 OPT_NEGBIT('q', "quiet", &options
.flags
,
1055 N_("be quiet. implies --no-stat"),
1056 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
1057 OPT_BIT('v', "verbose", &options
.flags
,
1058 N_("display a diffstat of what changed upstream"),
1059 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
1060 {OPTION_NEGBIT
, 'n', "no-stat", &options
.flags
, NULL
,
1061 N_("do not show diffstat of what changed upstream"),
1062 PARSE_OPT_NOARG
, NULL
, REBASE_DIFFSTAT
},
1063 OPT_BOOL(0, "signoff", &options
.signoff
,
1064 N_("add a Signed-off-by trailer to each commit")),
1065 OPT_BOOL(0, "committer-date-is-author-date",
1066 &options
.committer_date_is_author_date
,
1067 N_("make committer date match author date")),
1068 OPT_BOOL(0, "reset-author-date", &options
.ignore_date
,
1069 N_("ignore author date and use current date")),
1070 OPT_HIDDEN_BOOL(0, "ignore-date", &options
.ignore_date
,
1071 N_("synonym of --reset-author-date")),
1072 OPT_PASSTHRU_ARGV('C', NULL
, &options
.git_am_opts
, N_("n"),
1073 N_("passed to 'git apply'"), 0),
1074 OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace
,
1075 N_("ignore changes in whitespace")),
1076 OPT_PASSTHRU_ARGV(0, "whitespace", &options
.git_am_opts
,
1077 N_("action"), N_("passed to 'git apply'"), 0),
1078 OPT_BIT('f', "force-rebase", &options
.flags
,
1079 N_("cherry-pick all commits, even if unchanged"),
1081 OPT_BIT(0, "no-ff", &options
.flags
,
1082 N_("cherry-pick all commits, even if unchanged"),
1084 OPT_CMDMODE(0, "continue", &action
, N_("continue"),
1086 OPT_CMDMODE(0, "skip", &action
,
1087 N_("skip current patch and continue"), ACTION_SKIP
),
1088 OPT_CMDMODE(0, "abort", &action
,
1089 N_("abort and check out the original branch"),
1091 OPT_CMDMODE(0, "quit", &action
,
1092 N_("abort but keep HEAD where it is"), ACTION_QUIT
),
1093 OPT_CMDMODE(0, "edit-todo", &action
, N_("edit the todo list "
1094 "during an interactive rebase"), ACTION_EDIT_TODO
),
1095 OPT_CMDMODE(0, "show-current-patch", &action
,
1096 N_("show the patch file being applied or merged"),
1097 ACTION_SHOW_CURRENT_PATCH
),
1098 OPT_CALLBACK_F(0, "apply", &options
, NULL
,
1099 N_("use apply strategies to rebase"),
1100 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1102 OPT_CALLBACK_F('m', "merge", &options
, NULL
,
1103 N_("use merging strategies to rebase"),
1104 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1106 OPT_CALLBACK_F('i', "interactive", &options
, NULL
,
1107 N_("let the user edit the list of commits to rebase"),
1108 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1109 parse_opt_interactive
),
1110 OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected
,
1111 N_("(DEPRECATED) try to recreate merges instead of "
1113 1, PARSE_OPT_HIDDEN
),
1114 OPT_RERERE_AUTOUPDATE(&options
.allow_rerere_autoupdate
),
1115 OPT_CALLBACK_F(0, "empty", &options
, "{drop,keep,ask}",
1116 N_("how to handle commits that become empty"),
1117 PARSE_OPT_NONEG
, parse_opt_empty
),
1118 OPT_CALLBACK_F('k', "keep-empty", &options
, NULL
,
1119 N_("keep commits which start empty"),
1120 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
,
1121 parse_opt_keep_empty
),
1122 OPT_BOOL(0, "autosquash", &options
.autosquash
,
1123 N_("move commits that begin with "
1124 "squash!/fixup! under -i")),
1125 { OPTION_STRING
, 'S', "gpg-sign", &gpg_sign
, N_("key-id"),
1126 N_("GPG-sign commits"),
1127 PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
1128 OPT_AUTOSTASH(&options
.autostash
),
1129 OPT_STRING_LIST('x', "exec", &exec
, N_("exec"),
1130 N_("add exec lines after each commit of the "
1132 OPT_BOOL_F(0, "allow-empty-message",
1133 &options
.allow_empty_message
,
1134 N_("allow rebasing commits with empty messages"),
1136 {OPTION_STRING
, 'r', "rebase-merges", &rebase_merges
,
1138 N_("try to rebase merges instead of skipping them"),
1139 PARSE_OPT_OPTARG
, NULL
, (intptr_t)""},
1140 OPT_BOOL(0, "fork-point", &options
.fork_point
,
1141 N_("use 'merge-base --fork-point' to refine upstream")),
1142 OPT_STRING('s', "strategy", &options
.strategy
,
1143 N_("strategy"), N_("use the given merge strategy")),
1144 OPT_STRING_LIST('X', "strategy-option", &strategy_options
,
1146 N_("pass the argument through to the merge "
1148 OPT_BOOL(0, "root", &options
.root
,
1149 N_("rebase all reachable commits up to the root(s)")),
1150 OPT_BOOL(0, "reschedule-failed-exec",
1151 &reschedule_failed_exec
,
1152 N_("automatically re-schedule any `exec` that fails")),
1153 OPT_BOOL(0, "reapply-cherry-picks", &options
.reapply_cherry_picks
,
1154 N_("apply all changes, even those already present upstream")),
1159 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1160 usage_with_options(builtin_rebase_usage
,
1161 builtin_rebase_options
);
1163 prepare_repo_settings(the_repository
);
1164 the_repository
->settings
.command_requires_full_index
= 0;
1166 options
.allow_empty_message
= 1;
1167 git_config(rebase_config
, &options
);
1168 /* options.gpg_sign_opt will be either "-S" or NULL */
1169 gpg_sign
= options
.gpg_sign_opt
? "" : NULL
;
1170 FREE_AND_NULL(options
.gpg_sign_opt
);
1173 strbuf_addf(&buf
, "%s/applying", apply_dir());
1174 if(file_exists(buf
.buf
))
1175 die(_("It looks like 'git am' is in progress. Cannot rebase."));
1177 if (is_directory(apply_dir())) {
1178 options
.type
= REBASE_APPLY
;
1179 options
.state_dir
= apply_dir();
1180 } else if (is_directory(merge_dir())) {
1182 strbuf_addf(&buf
, "%s/rewritten", merge_dir());
1183 if (is_directory(buf
.buf
)) {
1184 die("`rebase -p` is no longer supported");
1187 strbuf_addf(&buf
, "%s/interactive", merge_dir());
1188 if(file_exists(buf
.buf
)) {
1189 options
.type
= REBASE_MERGE
;
1190 options
.flags
|= REBASE_INTERACTIVE_EXPLICIT
;
1192 options
.type
= REBASE_MERGE
;
1194 options
.state_dir
= merge_dir();
1197 if (options
.type
!= REBASE_UNSPECIFIED
)
1201 argc
= parse_options(argc
, argv
, prefix
,
1202 builtin_rebase_options
,
1203 builtin_rebase_usage
, 0);
1205 if (preserve_merges_selected
)
1206 die(_("--preserve-merges was replaced by --rebase-merges"));
1208 if (action
!= ACTION_NONE
&& total_argc
!= 2) {
1209 usage_with_options(builtin_rebase_usage
,
1210 builtin_rebase_options
);
1214 usage_with_options(builtin_rebase_usage
,
1215 builtin_rebase_options
);
1218 if (options
.onto_name
)
1219 die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto");
1221 die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");
1224 if (options
.root
&& options
.fork_point
> 0)
1225 die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
1227 if (action
!= ACTION_NONE
&& !in_progress
)
1228 die(_("No rebase in progress?"));
1229 setenv(GIT_REFLOG_ACTION_ENVIRONMENT
, "rebase", 0);
1231 if (action
== ACTION_EDIT_TODO
&& !is_merge(&options
))
1232 die(_("The --edit-todo action can only be used during "
1233 "interactive rebase."));
1235 if (trace2_is_enabled()) {
1236 if (is_merge(&options
))
1237 trace2_cmd_mode("interactive");
1239 trace2_cmd_mode("interactive-exec");
1241 trace2_cmd_mode(action_names
[action
]);
1245 case ACTION_CONTINUE
: {
1246 struct object_id head
;
1247 struct lock_file lock_file
= LOCK_INIT
;
1250 options
.action
= "continue";
1251 set_reflog_action(&options
);
1254 if (get_oid("HEAD", &head
))
1255 die(_("Cannot read HEAD"));
1257 fd
= hold_locked_index(&lock_file
, 0);
1258 if (repo_read_index(the_repository
) < 0)
1259 die(_("could not read index"));
1260 refresh_index(the_repository
->index
, REFRESH_QUIET
, NULL
, NULL
,
1263 repo_update_index_if_able(the_repository
, &lock_file
);
1264 rollback_lock_file(&lock_file
);
1266 if (has_unstaged_changes(the_repository
, 1)) {
1267 puts(_("You must edit all merge conflicts and then\n"
1268 "mark them as resolved using git add"));
1271 if (read_basic_state(&options
))
1276 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1278 options
.action
= "skip";
1279 set_reflog_action(&options
);
1281 rerere_clear(the_repository
, &merge_rr
);
1282 string_list_clear(&merge_rr
, 1);
1283 ropts
.flags
= RESET_HEAD_HARD
;
1284 if (reset_head(the_repository
, &ropts
) < 0)
1285 die(_("could not discard worktree changes"));
1286 remove_branch_state(the_repository
, 0);
1287 if (read_basic_state(&options
))
1291 case ACTION_ABORT
: {
1292 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1293 options
.action
= "abort";
1294 set_reflog_action(&options
);
1296 rerere_clear(the_repository
, &merge_rr
);
1297 string_list_clear(&merge_rr
, 1);
1299 if (read_basic_state(&options
))
1301 ropts
.oid
= &options
.orig_head
;
1302 ropts
.branch
= options
.head_name
;
1303 ropts
.flags
= RESET_HEAD_HARD
;
1304 ropts
.default_reflog_action
= DEFAULT_REFLOG_ACTION
;
1305 if (reset_head(the_repository
, &ropts
) < 0)
1306 die(_("could not move back to %s"),
1307 oid_to_hex(&options
.orig_head
));
1308 remove_branch_state(the_repository
, 0);
1309 ret
= finish_rebase(&options
);
1313 save_autostash(state_dir_path("autostash", &options
));
1314 if (options
.type
== REBASE_MERGE
) {
1315 struct replay_opts replay
= REPLAY_OPTS_INIT
;
1317 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
1318 ret
= sequencer_remove_state(&replay
);
1321 strbuf_addstr(&buf
, options
.state_dir
);
1322 ret
= remove_dir_recursively(&buf
, 0);
1324 error(_("could not remove '%s'"),
1329 case ACTION_EDIT_TODO
:
1330 options
.action
= "edit-todo";
1331 options
.dont_finish_rebase
= 1;
1333 case ACTION_SHOW_CURRENT_PATCH
:
1334 options
.action
= "show-current-patch";
1335 options
.dont_finish_rebase
= 1;
1340 BUG("action: %d", action
);
1343 /* Make sure no rebase is in progress */
1345 const char *last_slash
= strrchr(options
.state_dir
, '/');
1346 const char *state_dir_base
=
1347 last_slash
? last_slash
+ 1 : options
.state_dir
;
1348 const char *cmd_live_rebase
=
1349 "git rebase (--continue | --abort | --skip)";
1351 strbuf_addf(&buf
, "rm -fr \"%s\"", options
.state_dir
);
1352 die(_("It seems that there is already a %s directory, and\n"
1353 "I wonder if you are in the middle of another rebase. "
1355 "case, please try\n\t%s\n"
1356 "If that is not the case, please\n\t%s\n"
1357 "and run me again. I am stopping in case you still "
1359 "valuable there.\n"),
1360 state_dir_base
, cmd_live_rebase
, buf
.buf
);
1363 if ((options
.flags
& REBASE_INTERACTIVE_EXPLICIT
) ||
1364 (action
!= ACTION_NONE
) ||
1366 options
.autosquash
) {
1367 allow_preemptive_ff
= 0;
1369 if (options
.committer_date_is_author_date
|| options
.ignore_date
)
1370 options
.flags
|= REBASE_FORCE
;
1372 for (i
= 0; i
< options
.git_am_opts
.nr
; i
++) {
1373 const char *option
= options
.git_am_opts
.v
[i
], *p
;
1374 if (!strcmp(option
, "--whitespace=fix") ||
1375 !strcmp(option
, "--whitespace=strip"))
1376 allow_preemptive_ff
= 0;
1377 else if (skip_prefix(option
, "-C", &p
)) {
1379 if (!isdigit(*(p
++)))
1380 die(_("switch `C' expects a "
1381 "numerical value"));
1382 } else if (skip_prefix(option
, "--whitespace=", &p
)) {
1383 if (*p
&& strcmp(p
, "warn") && strcmp(p
, "nowarn") &&
1384 strcmp(p
, "error") && strcmp(p
, "error-all"))
1385 die("Invalid whitespace option: '%s'", p
);
1389 for (i
= 0; i
< exec
.nr
; i
++)
1390 if (check_exec_cmd(exec
.items
[i
].string
))
1393 if (!(options
.flags
& REBASE_NO_QUIET
))
1394 strvec_push(&options
.git_am_opts
, "-q");
1396 if (options
.empty
!= EMPTY_UNSPECIFIED
)
1397 imply_merge(&options
, "--empty");
1399 if (options
.reapply_cherry_picks
)
1400 imply_merge(&options
, "--reapply-cherry-picks");
1403 options
.gpg_sign_opt
= xstrfmt("-S%s", gpg_sign
);
1408 imply_merge(&options
, "--exec");
1411 for (i
= 0; i
< exec
.nr
; i
++)
1412 strbuf_addf(&buf
, "exec %s\n", exec
.items
[i
].string
);
1413 options
.cmd
= xstrdup(buf
.buf
);
1416 if (rebase_merges
) {
1417 if (!*rebase_merges
)
1418 ; /* default mode; do nothing */
1419 else if (!strcmp("rebase-cousins", rebase_merges
))
1420 options
.rebase_cousins
= 1;
1421 else if (strcmp("no-rebase-cousins", rebase_merges
))
1422 die(_("Unknown mode: %s"), rebase_merges
);
1423 options
.rebase_merges
= 1;
1424 imply_merge(&options
, "--rebase-merges");
1427 if (options
.type
== REBASE_APPLY
) {
1428 if (ignore_whitespace
)
1429 strvec_push(&options
.git_am_opts
,
1430 "--ignore-whitespace");
1431 if (options
.committer_date_is_author_date
)
1432 strvec_push(&options
.git_am_opts
,
1433 "--committer-date-is-author-date");
1434 if (options
.ignore_date
)
1435 strvec_push(&options
.git_am_opts
, "--ignore-date");
1438 if (ignore_whitespace
) {
1439 string_list_append(&strategy_options
,
1440 "ignore-space-change");
1444 if (strategy_options
.nr
) {
1447 if (!options
.strategy
)
1448 options
.strategy
= "ort";
1451 for (i
= 0; i
< strategy_options
.nr
; i
++)
1452 strbuf_addf(&buf
, " --%s",
1453 strategy_options
.items
[i
].string
);
1454 options
.strategy_opts
= xstrdup(buf
.buf
);
1457 if (options
.strategy
) {
1458 options
.strategy
= xstrdup(options
.strategy
);
1459 switch (options
.type
) {
1461 die(_("--strategy requires --merge or --interactive"));
1465 case REBASE_UNSPECIFIED
:
1466 options
.type
= REBASE_MERGE
;
1469 BUG("unhandled rebase type (%d)", options
.type
);
1473 if (options
.type
== REBASE_MERGE
)
1474 imply_merge(&options
, "--merge");
1476 if (options
.root
&& !options
.onto_name
)
1477 imply_merge(&options
, "--root without --onto");
1479 if (isatty(2) && options
.flags
& REBASE_NO_QUIET
)
1480 strbuf_addstr(&options
.git_format_patch_opt
, " --progress");
1482 if (options
.git_am_opts
.nr
|| options
.type
== REBASE_APPLY
) {
1483 /* all am options except -q are compatible only with --apply */
1484 for (i
= options
.git_am_opts
.nr
- 1; i
>= 0; i
--)
1485 if (strcmp(options
.git_am_opts
.v
[i
], "-q"))
1489 if (is_merge(&options
))
1490 die(_("apply options and merge options "
1491 "cannot be used together"));
1493 options
.type
= REBASE_APPLY
;
1497 if (options
.type
== REBASE_UNSPECIFIED
) {
1498 if (!strcmp(options
.default_backend
, "merge"))
1499 imply_merge(&options
, "--merge");
1500 else if (!strcmp(options
.default_backend
, "apply"))
1501 options
.type
= REBASE_APPLY
;
1503 die(_("Unknown rebase backend: %s"),
1504 options
.default_backend
);
1507 if (options
.type
== REBASE_MERGE
&&
1508 !options
.strategy
&&
1509 getenv("GIT_TEST_MERGE_ALGORITHM"))
1510 options
.strategy
= xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
1512 switch (options
.type
) {
1514 options
.state_dir
= merge_dir();
1517 options
.state_dir
= apply_dir();
1520 BUG("options.type was just set above; should be unreachable.");
1523 if (options
.empty
== EMPTY_UNSPECIFIED
) {
1524 if (options
.flags
& REBASE_INTERACTIVE_EXPLICIT
)
1525 options
.empty
= EMPTY_ASK
;
1526 else if (exec
.nr
> 0)
1527 options
.empty
= EMPTY_KEEP
;
1529 options
.empty
= EMPTY_DROP
;
1531 if (reschedule_failed_exec
> 0 && !is_merge(&options
))
1532 die(_("--reschedule-failed-exec requires "
1533 "--exec or --interactive"));
1534 if (reschedule_failed_exec
>= 0)
1535 options
.reschedule_failed_exec
= reschedule_failed_exec
;
1537 if (options
.signoff
) {
1538 strvec_push(&options
.git_am_opts
, "--signoff");
1539 options
.flags
|= REBASE_FORCE
;
1542 if (!options
.root
) {
1544 struct branch
*branch
;
1546 branch
= branch_get(NULL
);
1547 options
.upstream_name
= branch_get_upstream(branch
,
1549 if (!options
.upstream_name
)
1550 error_on_missing_default_upstream();
1551 if (options
.fork_point
< 0)
1552 options
.fork_point
= 1;
1554 options
.upstream_name
= argv
[0];
1557 if (!strcmp(options
.upstream_name
, "-"))
1558 options
.upstream_name
= "@{-1}";
1561 lookup_commit_reference_by_name(options
.upstream_name
);
1562 if (!options
.upstream
)
1563 die(_("invalid upstream '%s'"), options
.upstream_name
);
1564 options
.upstream_arg
= options
.upstream_name
;
1566 if (!options
.onto_name
) {
1567 if (commit_tree("", 0, the_hash_algo
->empty_tree
, NULL
,
1568 &squash_onto
, NULL
, NULL
) < 0)
1569 die(_("Could not create new root commit"));
1570 options
.squash_onto
= &squash_onto
;
1571 options
.onto_name
= squash_onto_name
=
1572 xstrdup(oid_to_hex(&squash_onto
));
1574 options
.root_with_onto
= 1;
1576 options
.upstream_name
= NULL
;
1577 options
.upstream
= NULL
;
1579 usage_with_options(builtin_rebase_usage
,
1580 builtin_rebase_options
);
1581 options
.upstream_arg
= "--root";
1584 /* Make sure the branch to rebase onto is valid. */
1587 strbuf_addstr(&buf
, options
.upstream_name
);
1588 strbuf_addstr(&buf
, "...");
1589 options
.onto_name
= xstrdup(buf
.buf
);
1590 } else if (!options
.onto_name
)
1591 options
.onto_name
= options
.upstream_name
;
1592 if (strstr(options
.onto_name
, "...")) {
1593 if (get_oid_mb(options
.onto_name
, &merge_base
) < 0) {
1595 die(_("'%s': need exactly one merge base with branch"),
1596 options
.upstream_name
);
1598 die(_("'%s': need exactly one merge base"),
1601 options
.onto
= lookup_commit_or_die(&merge_base
,
1605 lookup_commit_reference_by_name(options
.onto_name
);
1607 die(_("Does not point to a valid commit '%s'"),
1612 * If the branch to rebase is given, that is the branch we will rebase
1613 * branch_name -- branch/commit being rebased, or
1614 * HEAD (already detached)
1615 * orig_head -- commit object name of tip of the branch before rebasing
1616 * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
1619 /* Is it "rebase other branchname" or "rebase other commit"? */
1620 branch_name
= argv
[0];
1621 options
.switch_to
= argv
[0];
1623 /* Is it a local branch? */
1625 strbuf_addf(&buf
, "refs/heads/%s", branch_name
);
1626 if (!read_ref(buf
.buf
, &options
.orig_head
)) {
1627 die_if_checked_out(buf
.buf
, 1);
1628 options
.head_name
= xstrdup(buf
.buf
);
1629 /* If not is it a valid ref (branch or commit)? */
1631 struct commit
*commit
=
1632 lookup_commit_reference_by_name(branch_name
);
1634 die(_("no such branch/commit '%s'"),
1636 oidcpy(&options
.orig_head
, &commit
->object
.oid
);
1637 options
.head_name
= NULL
;
1639 } else if (argc
== 0) {
1640 /* Do not need to switch branches, we are already on it. */
1642 xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL
,
1644 if (!options
.head_name
)
1645 die(_("No such ref: %s"), "HEAD");
1646 if (flags
& REF_ISSYMREF
) {
1647 if (!skip_prefix(options
.head_name
,
1648 "refs/heads/", &branch_name
))
1649 branch_name
= options
.head_name
;
1652 FREE_AND_NULL(options
.head_name
);
1653 branch_name
= "HEAD";
1655 if (get_oid("HEAD", &options
.orig_head
))
1656 die(_("Could not resolve HEAD to a revision"));
1658 BUG("unexpected number of arguments left to parse");
1660 if (options
.fork_point
> 0) {
1661 struct commit
*head
=
1662 lookup_commit_reference(the_repository
,
1663 &options
.orig_head
);
1664 options
.restrict_revision
=
1665 get_fork_point(options
.upstream_name
, head
);
1668 if (repo_read_index(the_repository
) < 0)
1669 die(_("could not read index"));
1671 if (options
.autostash
)
1672 create_autostash(the_repository
,
1673 state_dir_path("autostash", &options
));
1676 if (require_clean_work_tree(the_repository
, "rebase",
1677 _("Please commit or stash them."), 1, 1)) {
1683 * Now we are rebasing commits upstream..orig_head (or with --root,
1684 * everything leading up to orig_head) on top of onto.
1688 * Check if we are already based on onto with linear history,
1689 * in which case we could fast-forward without replacing the commits
1690 * with new commits recreated by replaying their changes.
1692 * Note that can_fast_forward() initializes merge_base, so we have to
1693 * call it before checking allow_preemptive_ff.
1695 if (can_fast_forward(options
.onto
, options
.upstream
, options
.restrict_revision
,
1696 &options
.orig_head
, &merge_base
) &&
1697 allow_preemptive_ff
) {
1700 if (!(options
.flags
& REBASE_FORCE
)) {
1701 /* Lazily switch to the target branch if needed... */
1702 if (options
.switch_to
) {
1703 ret
= checkout_up_to_date(&options
);
1708 if (!(options
.flags
& REBASE_NO_QUIET
))
1710 else if (!strcmp(branch_name
, "HEAD") &&
1711 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1712 puts(_("HEAD is up to date."));
1714 printf(_("Current branch %s is up to date.\n"),
1716 ret
= finish_rebase(&options
);
1718 } else if (!(options
.flags
& REBASE_NO_QUIET
))
1720 else if (!strcmp(branch_name
, "HEAD") &&
1721 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1722 puts(_("HEAD is up to date, rebase forced."));
1724 printf(_("Current branch %s is up to date, rebase "
1725 "forced.\n"), branch_name
);
1728 /* If a hook exists, give it a chance to interrupt*/
1729 if (!ok_to_skip_pre_rebase
&&
1730 run_hooks_l("pre-rebase", options
.upstream_arg
,
1731 argc
? argv
[0] : NULL
, NULL
))
1732 die(_("The pre-rebase hook refused to rebase."));
1734 if (options
.flags
& REBASE_DIFFSTAT
) {
1735 struct diff_options opts
;
1737 if (options
.flags
& REBASE_VERBOSE
) {
1738 if (is_null_oid(&merge_base
))
1739 printf(_("Changes to %s:\n"),
1740 oid_to_hex(&options
.onto
->object
.oid
));
1742 printf(_("Changes from %s to %s:\n"),
1743 oid_to_hex(&merge_base
),
1744 oid_to_hex(&options
.onto
->object
.oid
));
1747 /* We want color (if set), but no pager */
1749 opts
.stat_width
= -1; /* use full terminal width */
1750 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
1751 opts
.output_format
|=
1752 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
1753 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1754 diff_setup_done(&opts
);
1755 diff_tree_oid(is_null_oid(&merge_base
) ?
1756 the_hash_algo
->empty_tree
: &merge_base
,
1757 &options
.onto
->object
.oid
, "", &opts
);
1758 diffcore_std(&opts
);
1762 if (is_merge(&options
))
1765 /* Detach HEAD and reset the tree */
1766 if (options
.flags
& REBASE_NO_QUIET
)
1767 printf(_("First, rewinding head to replay your work on top of "
1770 strbuf_addf(&msg
, "%s: checkout %s",
1771 getenv(GIT_REFLOG_ACTION_ENVIRONMENT
), options
.onto_name
);
1772 ropts
.oid
= &options
.onto
->object
.oid
;
1773 ropts
.orig_head
= &options
.orig_head
,
1774 ropts
.flags
= RESET_HEAD_DETACH
| RESET_ORIG_HEAD
|
1775 RESET_HEAD_RUN_POST_CHECKOUT_HOOK
;
1776 ropts
.head_msg
= msg
.buf
;
1777 ropts
.default_reflog_action
= DEFAULT_REFLOG_ACTION
;
1778 if (reset_head(the_repository
, &ropts
))
1779 die(_("Could not detach HEAD"));
1780 strbuf_release(&msg
);
1783 * If the onto is a proper descendant of the tip of the branch, then
1784 * we just fast-forwarded.
1787 if (oideq(&merge_base
, &options
.orig_head
)) {
1788 printf(_("Fast-forwarded %s to %s.\n"),
1789 branch_name
, options
.onto_name
);
1790 strbuf_addf(&msg
, "rebase finished: %s onto %s",
1791 options
.head_name
? options
.head_name
: "detached HEAD",
1792 oid_to_hex(&options
.onto
->object
.oid
));
1793 memset(&ropts
, 0, sizeof(ropts
));
1794 ropts
.branch
= options
.head_name
;
1795 ropts
.flags
= RESET_HEAD_REFS_ONLY
;
1796 ropts
.head_msg
= msg
.buf
;
1797 reset_head(the_repository
, &ropts
);
1798 strbuf_release(&msg
);
1799 ret
= finish_rebase(&options
);
1803 strbuf_addf(&revisions
, "%s..%s",
1804 options
.root
? oid_to_hex(&options
.onto
->object
.oid
) :
1805 (options
.restrict_revision
?
1806 oid_to_hex(&options
.restrict_revision
->object
.oid
) :
1807 oid_to_hex(&options
.upstream
->object
.oid
)),
1808 oid_to_hex(&options
.orig_head
));
1810 options
.revisions
= revisions
.buf
;
1813 ret
= run_specific_rebase(&options
, action
);
1816 strbuf_release(&buf
);
1817 strbuf_release(&revisions
);
1818 free(options
.head_name
);
1819 free(options
.gpg_sign_opt
);
1821 free(options
.strategy
);
1822 strbuf_release(&options
.git_format_patch_opt
);
1823 free(squash_onto_name
);