2 * "git rebase" builtin command
4 * Copyright (c) 2018 Pratik Karki
7 #define USE_THE_INDEX_COMPATIBILITY_MACROS
9 #include "run-command.h"
11 #include "argv-array.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"
32 #define DEFAULT_REFLOG_ACTION "rebase"
34 static char const * const builtin_rebase_usage
[] = {
35 N_("git rebase [-i] [options] [--exec <cmd>] "
36 "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
37 N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
39 N_("git rebase --continue | --abort | --skip | --edit-todo"),
43 static GIT_PATH_FUNC(path_squash_onto
, "rebase-merge/squash-onto")
44 static GIT_PATH_FUNC(path_interactive
, "rebase-merge/interactive")
45 static GIT_PATH_FUNC(apply_dir
, "rebase-apply")
46 static GIT_PATH_FUNC(merge_dir
, "rebase-merge")
49 REBASE_UNSPECIFIED
= -1,
52 REBASE_PRESERVE_MERGES
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 argv_array git_am_opts
;
90 int allow_rerere_autoupdate
;
95 int allow_empty_message
;
96 int rebase_merges
, rebase_cousins
;
97 char *strategy
, *strategy_opts
;
98 struct strbuf git_format_patch_opt
;
99 int reschedule_failed_exec
;
100 int use_legacy_rebase
;
103 #define REBASE_OPTIONS_INIT { \
104 .type = REBASE_UNSPECIFIED, \
105 .empty = EMPTY_UNSPECIFIED, \
106 .default_backend = "merge", \
107 .flags = REBASE_NO_QUIET, \
108 .git_am_opts = ARGV_ARRAY_INIT, \
109 .git_format_patch_opt = STRBUF_INIT \
112 static struct replay_opts
get_replay_opts(const struct rebase_options
*opts
)
114 struct replay_opts replay
= REPLAY_OPTS_INIT
;
116 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
117 sequencer_init_config(&replay
);
119 replay
.signoff
= opts
->signoff
;
120 replay
.allow_ff
= !(opts
->flags
& REBASE_FORCE
);
121 if (opts
->allow_rerere_autoupdate
)
122 replay
.allow_rerere_auto
= opts
->allow_rerere_autoupdate
;
123 replay
.allow_empty
= 1;
124 replay
.allow_empty_message
= opts
->allow_empty_message
;
125 replay
.drop_redundant_commits
= (opts
->empty
== EMPTY_DROP
);
126 replay
.keep_redundant_commits
= (opts
->empty
== EMPTY_KEEP
);
127 replay
.quiet
= !(opts
->flags
& REBASE_NO_QUIET
);
128 replay
.verbose
= opts
->flags
& REBASE_VERBOSE
;
129 replay
.reschedule_failed_exec
= opts
->reschedule_failed_exec
;
130 replay
.gpg_sign
= xstrdup_or_null(opts
->gpg_sign_opt
);
131 replay
.strategy
= opts
->strategy
;
132 if (opts
->strategy_opts
)
133 parse_strategy_opts(&replay
, opts
->strategy_opts
);
135 if (opts
->squash_onto
) {
136 oidcpy(&replay
.squash_onto
, opts
->squash_onto
);
137 replay
.have_squash_onto
= 1;
150 ACTION_SHOW_CURRENT_PATCH
,
153 ACTION_CHECK_TODO_LIST
,
154 ACTION_REARRANGE_SQUASH
,
158 static const char *action_names
[] = { "undefined",
164 "show_current_patch" };
166 static int add_exec_commands(struct string_list
*commands
)
168 const char *todo_file
= rebase_path_todo();
169 struct todo_list todo_list
= TODO_LIST_INIT
;
172 if (strbuf_read_file(&todo_list
.buf
, todo_file
, 0) < 0)
173 return error_errno(_("could not read '%s'."), todo_file
);
175 if (todo_list_parse_insn_buffer(the_repository
, todo_list
.buf
.buf
,
177 todo_list_release(&todo_list
);
178 return error(_("unusable todo list: '%s'"), todo_file
);
181 todo_list_add_exec_commands(&todo_list
, commands
);
182 res
= todo_list_write_to_file(the_repository
, &todo_list
,
183 todo_file
, NULL
, NULL
, -1, 0);
184 todo_list_release(&todo_list
);
187 return error_errno(_("could not write '%s'."), todo_file
);
191 static int rearrange_squash_in_todo_file(void)
193 const char *todo_file
= rebase_path_todo();
194 struct todo_list todo_list
= TODO_LIST_INIT
;
197 if (strbuf_read_file(&todo_list
.buf
, todo_file
, 0) < 0)
198 return error_errno(_("could not read '%s'."), todo_file
);
199 if (todo_list_parse_insn_buffer(the_repository
, todo_list
.buf
.buf
,
201 todo_list_release(&todo_list
);
202 return error(_("unusable todo list: '%s'"), todo_file
);
205 res
= todo_list_rearrange_squash(&todo_list
);
207 res
= todo_list_write_to_file(the_repository
, &todo_list
,
208 todo_file
, NULL
, NULL
, -1, 0);
210 todo_list_release(&todo_list
);
213 return error_errno(_("could not write '%s'."), todo_file
);
217 static int transform_todo_file(unsigned flags
)
219 const char *todo_file
= rebase_path_todo();
220 struct todo_list todo_list
= TODO_LIST_INIT
;
223 if (strbuf_read_file(&todo_list
.buf
, todo_file
, 0) < 0)
224 return error_errno(_("could not read '%s'."), todo_file
);
226 if (todo_list_parse_insn_buffer(the_repository
, todo_list
.buf
.buf
,
228 todo_list_release(&todo_list
);
229 return error(_("unusable todo list: '%s'"), todo_file
);
232 res
= todo_list_write_to_file(the_repository
, &todo_list
, todo_file
,
233 NULL
, NULL
, -1, flags
);
234 todo_list_release(&todo_list
);
237 return error_errno(_("could not write '%s'."), todo_file
);
241 static int edit_todo_file(unsigned flags
)
243 const char *todo_file
= rebase_path_todo();
244 struct todo_list todo_list
= TODO_LIST_INIT
,
245 new_todo
= TODO_LIST_INIT
;
248 if (strbuf_read_file(&todo_list
.buf
, todo_file
, 0) < 0)
249 return error_errno(_("could not read '%s'."), todo_file
);
251 strbuf_stripspace(&todo_list
.buf
, 1);
252 res
= edit_todo_list(the_repository
, &todo_list
, &new_todo
, NULL
, NULL
, flags
);
253 if (!res
&& todo_list_write_to_file(the_repository
, &new_todo
, todo_file
,
254 NULL
, NULL
, -1, flags
& ~(TODO_LIST_SHORTEN_IDS
)))
255 res
= error_errno(_("could not write '%s'"), todo_file
);
257 todo_list_release(&todo_list
);
258 todo_list_release(&new_todo
);
263 static int get_revision_ranges(struct commit
*upstream
, struct commit
*onto
,
264 struct object_id
*orig_head
, const char **head_hash
,
265 char **revisions
, char **shortrevisions
)
267 struct commit
*base_rev
= upstream
? upstream
: onto
;
268 const char *shorthead
;
270 *head_hash
= find_unique_abbrev(orig_head
, GIT_MAX_HEXSZ
);
271 *revisions
= xstrfmt("%s...%s", oid_to_hex(&base_rev
->object
.oid
),
274 shorthead
= find_unique_abbrev(orig_head
, DEFAULT_ABBREV
);
277 const char *shortrev
;
279 shortrev
= find_unique_abbrev(&base_rev
->object
.oid
,
282 *shortrevisions
= xstrfmt("%s..%s", shortrev
, shorthead
);
284 *shortrevisions
= xstrdup(shorthead
);
289 static int init_basic_state(struct replay_opts
*opts
, const char *head_name
,
290 struct commit
*onto
, const char *orig_head
)
294 if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
295 return error_errno(_("could not create temporary %s"), merge_dir());
297 delete_reflog("REBASE_HEAD");
299 interactive
= fopen(path_interactive(), "w");
301 return error_errno(_("could not mark as interactive"));
304 return write_basic_state(opts
, head_name
, onto
, orig_head
);
307 static void split_exec_commands(const char *cmd
, struct string_list
*commands
)
310 string_list_split(commands
, cmd
, '\n', -1);
312 /* rebase.c adds a new line to cmd after every command,
313 * so here the last command is always empty */
314 string_list_remove_empty_items(commands
, 0);
318 static int do_interactive_rebase(struct rebase_options
*opts
, unsigned flags
)
321 const char *head_hash
= NULL
;
322 char *revisions
= NULL
, *shortrevisions
= NULL
;
323 struct argv_array make_script_args
= ARGV_ARRAY_INIT
;
324 struct todo_list todo_list
= TODO_LIST_INIT
;
325 struct replay_opts replay
= get_replay_opts(opts
);
326 struct string_list commands
= STRING_LIST_INIT_DUP
;
328 if (get_revision_ranges(opts
->upstream
, opts
->onto
, &opts
->orig_head
,
329 &head_hash
, &revisions
, &shortrevisions
))
332 if (init_basic_state(&replay
,
333 opts
->head_name
? opts
->head_name
: "detached HEAD",
334 opts
->onto
, head_hash
)) {
336 free(shortrevisions
);
341 if (!opts
->upstream
&& opts
->squash_onto
)
342 write_file(path_squash_onto(), "%s\n",
343 oid_to_hex(opts
->squash_onto
));
345 argv_array_pushl(&make_script_args
, "", revisions
, NULL
);
346 if (opts
->restrict_revision
)
347 argv_array_pushf(&make_script_args
, "^%s",
348 oid_to_hex(&opts
->restrict_revision
->object
.oid
));
350 ret
= sequencer_make_script(the_repository
, &todo_list
.buf
,
351 make_script_args
.argc
, make_script_args
.argv
,
355 error(_("could not generate todo list"));
358 if (todo_list_parse_insn_buffer(the_repository
, todo_list
.buf
.buf
,
360 BUG("unusable todo list");
362 split_exec_commands(opts
->cmd
, &commands
);
363 ret
= complete_action(the_repository
, &replay
, flags
,
364 shortrevisions
, opts
->onto_name
, opts
->onto
, head_hash
,
365 &commands
, opts
->autosquash
, &todo_list
);
368 string_list_clear(&commands
, 0);
370 free(shortrevisions
);
371 todo_list_release(&todo_list
);
372 argv_array_clear(&make_script_args
);
377 static int run_sequencer_rebase(struct rebase_options
*opts
,
381 int abbreviate_commands
= 0, ret
= 0;
383 git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands
);
385 flags
|= abbreviate_commands
? TODO_LIST_ABBREVIATE_CMDS
: 0;
386 flags
|= opts
->rebase_merges
? TODO_LIST_REBASE_MERGES
: 0;
387 flags
|= opts
->rebase_cousins
> 0 ? TODO_LIST_REBASE_COUSINS
: 0;
388 flags
|= opts
->root_with_onto
? TODO_LIST_ROOT_WITH_ONTO
: 0;
389 flags
|= command
== ACTION_SHORTEN_OIDS
? TODO_LIST_SHORTEN_IDS
: 0;
393 if (!opts
->onto
&& !opts
->upstream
)
394 die(_("a base commit must be provided with --upstream or --onto"));
396 ret
= do_interactive_rebase(opts
, flags
);
400 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
402 rerere_clear(the_repository
, &merge_rr
);
405 case ACTION_CONTINUE
: {
406 struct replay_opts replay_opts
= get_replay_opts(opts
);
408 ret
= sequencer_continue(the_repository
, &replay_opts
);
411 case ACTION_EDIT_TODO
:
412 ret
= edit_todo_file(flags
);
414 case ACTION_SHOW_CURRENT_PATCH
: {
415 struct child_process cmd
= CHILD_PROCESS_INIT
;
418 argv_array_pushl(&cmd
.args
, "show", "REBASE_HEAD", "--", NULL
);
419 ret
= run_command(&cmd
);
423 case ACTION_SHORTEN_OIDS
:
424 case ACTION_EXPAND_OIDS
:
425 ret
= transform_todo_file(flags
);
427 case ACTION_CHECK_TODO_LIST
:
428 ret
= check_todo_list_from_file(the_repository
);
430 case ACTION_REARRANGE_SQUASH
:
431 ret
= rearrange_squash_in_todo_file();
433 case ACTION_ADD_EXEC
: {
434 struct string_list commands
= STRING_LIST_INIT_DUP
;
436 split_exec_commands(opts
->cmd
, &commands
);
437 ret
= add_exec_commands(&commands
);
438 string_list_clear(&commands
, 0);
442 BUG("invalid command '%d'", command
);
448 static int parse_opt_keep_empty(const struct option
*opt
, const char *arg
,
451 struct rebase_options
*opts
= opt
->value
;
456 * If we ever want to remap --keep-empty to --empty=keep, insert:
457 * opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP;
459 opts
->type
= REBASE_MERGE
;
463 static const char * const builtin_rebase_interactive_usage
[] = {
464 N_("git rebase--interactive [<options>]"),
468 int cmd_rebase__interactive(int argc
, const char **argv
, const char *prefix
)
470 struct rebase_options opts
= REBASE_OPTIONS_INIT
;
471 struct object_id squash_onto
= null_oid
;
472 enum action command
= ACTION_NONE
;
473 struct option options
[] = {
474 OPT_NEGBIT(0, "ff", &opts
.flags
, N_("allow fast-forward"),
476 { OPTION_CALLBACK
, 'k', "keep-empty", &options
, NULL
,
477 N_("(DEPRECATED) keep empty commits"),
478 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
,
479 parse_opt_keep_empty
},
480 OPT_BOOL_F(0, "allow-empty-message", &opts
.allow_empty_message
,
481 N_("allow commits with empty messages"),
483 OPT_BOOL(0, "rebase-merges", &opts
.rebase_merges
, N_("rebase merge commits")),
484 OPT_BOOL(0, "rebase-cousins", &opts
.rebase_cousins
,
485 N_("keep original branch points of cousins")),
486 OPT_BOOL(0, "autosquash", &opts
.autosquash
,
487 N_("move commits that begin with squash!/fixup!")),
488 OPT_BOOL(0, "signoff", &opts
.signoff
, N_("sign commits")),
489 OPT_BIT('v', "verbose", &opts
.flags
,
490 N_("display a diffstat of what changed upstream"),
491 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
492 OPT_CMDMODE(0, "continue", &command
, N_("continue rebase"),
494 OPT_CMDMODE(0, "skip", &command
, N_("skip commit"), ACTION_SKIP
),
495 OPT_CMDMODE(0, "edit-todo", &command
, N_("edit the todo list"),
497 OPT_CMDMODE(0, "show-current-patch", &command
, N_("show the current patch"),
498 ACTION_SHOW_CURRENT_PATCH
),
499 OPT_CMDMODE(0, "shorten-ids", &command
,
500 N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS
),
501 OPT_CMDMODE(0, "expand-ids", &command
,
502 N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS
),
503 OPT_CMDMODE(0, "check-todo-list", &command
,
504 N_("check the todo list"), ACTION_CHECK_TODO_LIST
),
505 OPT_CMDMODE(0, "rearrange-squash", &command
,
506 N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH
),
507 OPT_CMDMODE(0, "add-exec-commands", &command
,
508 N_("insert exec commands in todo list"), ACTION_ADD_EXEC
),
509 { OPTION_CALLBACK
, 0, "onto", &opts
.onto
, N_("onto"), N_("onto"),
510 PARSE_OPT_NONEG
, parse_opt_commit
, 0 },
511 { OPTION_CALLBACK
, 0, "restrict-revision", &opts
.restrict_revision
,
512 N_("restrict-revision"), N_("restrict revision"),
513 PARSE_OPT_NONEG
, parse_opt_commit
, 0 },
514 { OPTION_CALLBACK
, 0, "squash-onto", &squash_onto
, N_("squash-onto"),
515 N_("squash onto"), PARSE_OPT_NONEG
, parse_opt_object_id
, 0 },
516 { OPTION_CALLBACK
, 0, "upstream", &opts
.upstream
, N_("upstream"),
517 N_("the upstream commit"), PARSE_OPT_NONEG
, parse_opt_commit
,
519 OPT_STRING(0, "head-name", &opts
.head_name
, N_("head-name"), N_("head name")),
520 { OPTION_STRING
, 'S', "gpg-sign", &opts
.gpg_sign_opt
, N_("key-id"),
521 N_("GPG-sign commits"),
522 PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
523 OPT_STRING(0, "strategy", &opts
.strategy
, N_("strategy"),
524 N_("rebase strategy")),
525 OPT_STRING(0, "strategy-opts", &opts
.strategy_opts
, N_("strategy-opts"),
526 N_("strategy options")),
527 OPT_STRING(0, "switch-to", &opts
.switch_to
, N_("switch-to"),
528 N_("the branch or commit to checkout")),
529 OPT_STRING(0, "onto-name", &opts
.onto_name
, N_("onto-name"), N_("onto name")),
530 OPT_STRING(0, "cmd", &opts
.cmd
, N_("cmd"), N_("the command to run")),
531 OPT_RERERE_AUTOUPDATE(&opts
.allow_rerere_autoupdate
),
532 OPT_BOOL(0, "reschedule-failed-exec", &opts
.reschedule_failed_exec
,
533 N_("automatically re-schedule any `exec` that fails")),
537 opts
.rebase_cousins
= -1;
540 usage_with_options(builtin_rebase_interactive_usage
, options
);
542 argc
= parse_options(argc
, argv
, prefix
, options
,
543 builtin_rebase_interactive_usage
, PARSE_OPT_KEEP_ARGV0
);
545 if (!is_null_oid(&squash_onto
))
546 opts
.squash_onto
= &squash_onto
;
548 if (opts
.rebase_cousins
>= 0 && !opts
.rebase_merges
)
549 warning(_("--[no-]rebase-cousins has no effect without "
552 return !!run_sequencer_rebase(&opts
, command
);
555 static int is_merge(struct rebase_options
*opts
)
557 return opts
->type
== REBASE_MERGE
||
558 opts
->type
== REBASE_PRESERVE_MERGES
;
561 static void imply_merge(struct rebase_options
*opts
, const char *option
)
563 switch (opts
->type
) {
565 die(_("%s requires an interactive rebase"), option
);
568 case REBASE_PRESERVE_MERGES
:
571 opts
->type
= REBASE_MERGE
; /* implied */
576 /* Returns the filename prefixed by the state_dir */
577 static const char *state_dir_path(const char *filename
, struct rebase_options
*opts
)
579 static struct strbuf path
= STRBUF_INIT
;
580 static size_t prefix_len
;
583 strbuf_addf(&path
, "%s/", opts
->state_dir
);
584 prefix_len
= path
.len
;
587 strbuf_setlen(&path
, prefix_len
);
588 strbuf_addstr(&path
, filename
);
592 /* Initialize the rebase options from the state directory. */
593 static int read_basic_state(struct rebase_options
*opts
)
595 struct strbuf head_name
= STRBUF_INIT
;
596 struct strbuf buf
= STRBUF_INIT
;
597 struct object_id oid
;
599 if (!read_oneliner(&head_name
, state_dir_path("head-name", opts
),
600 READ_ONELINER_WARN_MISSING
) ||
601 !read_oneliner(&buf
, state_dir_path("onto", opts
),
602 READ_ONELINER_WARN_MISSING
))
604 opts
->head_name
= starts_with(head_name
.buf
, "refs/") ?
605 xstrdup(head_name
.buf
) : NULL
;
606 strbuf_release(&head_name
);
607 if (get_oid(buf
.buf
, &oid
))
608 return error(_("could not get 'onto': '%s'"), buf
.buf
);
609 opts
->onto
= lookup_commit_or_die(&oid
, buf
.buf
);
612 * We always write to orig-head, but interactive rebase used to write to
613 * head. Fall back to reading from head to cover for the case that the
614 * user upgraded git with an ongoing interactive rebase.
617 if (file_exists(state_dir_path("orig-head", opts
))) {
618 if (!read_oneliner(&buf
, state_dir_path("orig-head", opts
),
619 READ_ONELINER_WARN_MISSING
))
621 } else if (!read_oneliner(&buf
, state_dir_path("head", opts
),
622 READ_ONELINER_WARN_MISSING
))
624 if (get_oid(buf
.buf
, &opts
->orig_head
))
625 return error(_("invalid orig-head: '%s'"), buf
.buf
);
627 if (file_exists(state_dir_path("quiet", opts
)))
628 opts
->flags
&= ~REBASE_NO_QUIET
;
630 opts
->flags
|= REBASE_NO_QUIET
;
632 if (file_exists(state_dir_path("verbose", opts
)))
633 opts
->flags
|= REBASE_VERBOSE
;
635 if (file_exists(state_dir_path("signoff", opts
))) {
637 opts
->flags
|= REBASE_FORCE
;
640 if (file_exists(state_dir_path("allow_rerere_autoupdate", opts
))) {
642 if (!read_oneliner(&buf
, state_dir_path("allow_rerere_autoupdate", opts
),
643 READ_ONELINER_WARN_MISSING
))
645 if (!strcmp(buf
.buf
, "--rerere-autoupdate"))
646 opts
->allow_rerere_autoupdate
= RERERE_AUTOUPDATE
;
647 else if (!strcmp(buf
.buf
, "--no-rerere-autoupdate"))
648 opts
->allow_rerere_autoupdate
= RERERE_NOAUTOUPDATE
;
650 warning(_("ignoring invalid allow_rerere_autoupdate: "
654 if (file_exists(state_dir_path("gpg_sign_opt", opts
))) {
656 if (!read_oneliner(&buf
, state_dir_path("gpg_sign_opt", opts
),
657 READ_ONELINER_WARN_MISSING
))
659 free(opts
->gpg_sign_opt
);
660 opts
->gpg_sign_opt
= xstrdup(buf
.buf
);
663 if (file_exists(state_dir_path("strategy", opts
))) {
665 if (!read_oneliner(&buf
, state_dir_path("strategy", opts
),
666 READ_ONELINER_WARN_MISSING
))
668 free(opts
->strategy
);
669 opts
->strategy
= xstrdup(buf
.buf
);
672 if (file_exists(state_dir_path("strategy_opts", opts
))) {
674 if (!read_oneliner(&buf
, state_dir_path("strategy_opts", opts
),
675 READ_ONELINER_WARN_MISSING
))
677 free(opts
->strategy_opts
);
678 opts
->strategy_opts
= xstrdup(buf
.buf
);
681 strbuf_release(&buf
);
686 static int rebase_write_basic_state(struct rebase_options
*opts
)
688 write_file(state_dir_path("head-name", opts
), "%s",
689 opts
->head_name
? opts
->head_name
: "detached HEAD");
690 write_file(state_dir_path("onto", opts
), "%s",
691 opts
->onto
? oid_to_hex(&opts
->onto
->object
.oid
) : "");
692 write_file(state_dir_path("orig-head", opts
), "%s",
693 oid_to_hex(&opts
->orig_head
));
694 if (!(opts
->flags
& REBASE_NO_QUIET
))
695 write_file(state_dir_path("quiet", opts
), "%s", "");
696 if (opts
->flags
& REBASE_VERBOSE
)
697 write_file(state_dir_path("verbose", opts
), "%s", "");
699 write_file(state_dir_path("strategy", opts
), "%s",
701 if (opts
->strategy_opts
)
702 write_file(state_dir_path("strategy_opts", opts
), "%s",
703 opts
->strategy_opts
);
704 if (opts
->allow_rerere_autoupdate
> 0)
705 write_file(state_dir_path("allow_rerere_autoupdate", opts
),
706 "-%s-rerere-autoupdate",
707 opts
->allow_rerere_autoupdate
== RERERE_AUTOUPDATE
?
709 if (opts
->gpg_sign_opt
)
710 write_file(state_dir_path("gpg_sign_opt", opts
), "%s",
713 write_file(state_dir_path("signoff", opts
), "--signoff");
718 static int finish_rebase(struct rebase_options
*opts
)
720 struct strbuf dir
= STRBUF_INIT
;
721 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
724 delete_ref(NULL
, "REBASE_HEAD", NULL
, REF_NO_DEREF
);
725 apply_autostash(state_dir_path("autostash", opts
));
726 close_object_store(the_repository
->objects
);
728 * We ignore errors in 'gc --auto', since the
729 * user should see them.
731 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
732 if (opts
->type
== REBASE_MERGE
) {
733 struct replay_opts replay
= REPLAY_OPTS_INIT
;
735 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
736 ret
= sequencer_remove_state(&replay
);
738 strbuf_addstr(&dir
, opts
->state_dir
);
739 if (remove_dir_recursively(&dir
, 0))
740 ret
= error(_("could not remove '%s'"),
742 strbuf_release(&dir
);
748 static struct commit
*peel_committish(const char *name
)
751 struct object_id oid
;
753 if (get_oid(name
, &oid
))
755 obj
= parse_object(the_repository
, &oid
);
756 return (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
759 static void add_var(struct strbuf
*buf
, const char *name
, const char *value
)
762 strbuf_addf(buf
, "unset %s; ", name
);
764 strbuf_addf(buf
, "%s=", name
);
765 sq_quote_buf(buf
, value
);
766 strbuf_addstr(buf
, "; ");
770 static int move_to_original_branch(struct rebase_options
*opts
)
772 struct strbuf orig_head_reflog
= STRBUF_INIT
, head_reflog
= STRBUF_INIT
;
775 if (!opts
->head_name
)
776 return 0; /* nothing to move back to */
779 BUG("move_to_original_branch without onto");
781 strbuf_addf(&orig_head_reflog
, "rebase finished: %s onto %s",
782 opts
->head_name
, oid_to_hex(&opts
->onto
->object
.oid
));
783 strbuf_addf(&head_reflog
, "rebase finished: returning to %s",
785 ret
= reset_head(the_repository
, NULL
, "", opts
->head_name
,
786 RESET_HEAD_REFS_ONLY
,
787 orig_head_reflog
.buf
, head_reflog
.buf
,
788 DEFAULT_REFLOG_ACTION
);
790 strbuf_release(&orig_head_reflog
);
791 strbuf_release(&head_reflog
);
795 static const char *resolvemsg
=
796 N_("Resolve all conflicts manually, mark them as resolved with\n"
797 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
798 "You can instead skip this commit: run \"git rebase --skip\".\n"
799 "To abort and get back to the state before \"git rebase\", run "
800 "\"git rebase --abort\".");
802 static int run_am(struct rebase_options
*opts
)
804 struct child_process am
= CHILD_PROCESS_INIT
;
805 struct child_process format_patch
= CHILD_PROCESS_INIT
;
806 struct strbuf revisions
= STRBUF_INIT
;
808 char *rebased_patches
;
811 argv_array_push(&am
.args
, "am");
813 if (opts
->action
&& !strcmp("continue", opts
->action
)) {
814 argv_array_push(&am
.args
, "--resolved");
815 argv_array_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
816 if (opts
->gpg_sign_opt
)
817 argv_array_push(&am
.args
, opts
->gpg_sign_opt
);
818 status
= run_command(&am
);
822 return move_to_original_branch(opts
);
824 if (opts
->action
&& !strcmp("skip", opts
->action
)) {
825 argv_array_push(&am
.args
, "--skip");
826 argv_array_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
827 status
= run_command(&am
);
831 return move_to_original_branch(opts
);
833 if (opts
->action
&& !strcmp("show-current-patch", opts
->action
)) {
834 argv_array_push(&am
.args
, "--show-current-patch");
835 return run_command(&am
);
838 strbuf_addf(&revisions
, "%s...%s",
839 oid_to_hex(opts
->root
?
840 /* this is now equivalent to !opts->upstream */
841 &opts
->onto
->object
.oid
:
842 &opts
->upstream
->object
.oid
),
843 oid_to_hex(&opts
->orig_head
));
845 rebased_patches
= xstrdup(git_path("rebased-patches"));
846 format_patch
.out
= open(rebased_patches
,
847 O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
848 if (format_patch
.out
< 0) {
849 status
= error_errno(_("could not open '%s' for writing"),
851 free(rebased_patches
);
852 argv_array_clear(&am
.args
);
856 format_patch
.git_cmd
= 1;
857 argv_array_pushl(&format_patch
.args
, "format-patch", "-k", "--stdout",
858 "--full-index", "--cherry-pick", "--right-only",
859 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
860 "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
862 if (opts
->git_format_patch_opt
.len
)
863 argv_array_split(&format_patch
.args
,
864 opts
->git_format_patch_opt
.buf
);
865 argv_array_push(&format_patch
.args
, revisions
.buf
);
866 if (opts
->restrict_revision
)
867 argv_array_pushf(&format_patch
.args
, "^%s",
868 oid_to_hex(&opts
->restrict_revision
->object
.oid
));
870 status
= run_command(&format_patch
);
872 unlink(rebased_patches
);
873 free(rebased_patches
);
874 argv_array_clear(&am
.args
);
876 reset_head(the_repository
, &opts
->orig_head
, "checkout",
878 "HEAD", NULL
, DEFAULT_REFLOG_ACTION
);
879 error(_("\ngit encountered an error while preparing the "
880 "patches to replay\n"
883 "As a result, git cannot rebase them."),
886 strbuf_release(&revisions
);
889 strbuf_release(&revisions
);
891 am
.in
= open(rebased_patches
, O_RDONLY
);
893 status
= error_errno(_("could not open '%s' for reading"),
895 free(rebased_patches
);
896 argv_array_clear(&am
.args
);
900 argv_array_pushv(&am
.args
, opts
->git_am_opts
.argv
);
901 argv_array_push(&am
.args
, "--rebasing");
902 argv_array_pushf(&am
.args
, "--resolvemsg=%s", resolvemsg
);
903 argv_array_push(&am
.args
, "--patch-format=mboxrd");
904 if (opts
->allow_rerere_autoupdate
== RERERE_AUTOUPDATE
)
905 argv_array_push(&am
.args
, "--rerere-autoupdate");
906 else if (opts
->allow_rerere_autoupdate
== RERERE_NOAUTOUPDATE
)
907 argv_array_push(&am
.args
, "--no-rerere-autoupdate");
908 if (opts
->gpg_sign_opt
)
909 argv_array_push(&am
.args
, opts
->gpg_sign_opt
);
910 status
= run_command(&am
);
911 unlink(rebased_patches
);
912 free(rebased_patches
);
915 return move_to_original_branch(opts
);
918 if (is_directory(opts
->state_dir
))
919 rebase_write_basic_state(opts
);
924 static int run_specific_rebase(struct rebase_options
*opts
, enum action action
)
926 const char *argv
[] = { NULL
, NULL
};
927 struct strbuf script_snippet
= STRBUF_INIT
, buf
= STRBUF_INIT
;
929 const char *backend
, *backend_func
;
931 if (opts
->type
== REBASE_MERGE
) {
932 /* Run sequencer-based rebase */
933 setenv("GIT_CHERRY_PICK_HELP", resolvemsg
, 1);
934 if (!(opts
->flags
& REBASE_INTERACTIVE_EXPLICIT
)) {
935 setenv("GIT_SEQUENCE_EDITOR", ":", 1);
936 opts
->autosquash
= 0;
938 if (opts
->gpg_sign_opt
) {
939 /* remove the leading "-S" */
940 char *tmp
= xstrdup(opts
->gpg_sign_opt
+ 2);
941 free(opts
->gpg_sign_opt
);
942 opts
->gpg_sign_opt
= tmp
;
945 status
= run_sequencer_rebase(opts
, action
);
946 goto finished_rebase
;
949 if (opts
->type
== REBASE_APPLY
) {
950 status
= run_am(opts
);
951 goto finished_rebase
;
954 add_var(&script_snippet
, "GIT_DIR", absolute_path(get_git_dir()));
955 add_var(&script_snippet
, "state_dir", opts
->state_dir
);
957 add_var(&script_snippet
, "upstream_name", opts
->upstream_name
);
958 add_var(&script_snippet
, "upstream", opts
->upstream
?
959 oid_to_hex(&opts
->upstream
->object
.oid
) : NULL
);
960 add_var(&script_snippet
, "head_name",
961 opts
->head_name
? opts
->head_name
: "detached HEAD");
962 add_var(&script_snippet
, "orig_head", oid_to_hex(&opts
->orig_head
));
963 add_var(&script_snippet
, "onto", opts
->onto
?
964 oid_to_hex(&opts
->onto
->object
.oid
) : NULL
);
965 add_var(&script_snippet
, "onto_name", opts
->onto_name
);
966 add_var(&script_snippet
, "revisions", opts
->revisions
);
967 add_var(&script_snippet
, "restrict_revision", opts
->restrict_revision
?
968 oid_to_hex(&opts
->restrict_revision
->object
.oid
) : NULL
);
969 sq_quote_argv_pretty(&buf
, opts
->git_am_opts
.argv
);
970 add_var(&script_snippet
, "git_am_opt", buf
.buf
);
971 strbuf_release(&buf
);
972 add_var(&script_snippet
, "verbose",
973 opts
->flags
& REBASE_VERBOSE
? "t" : "");
974 add_var(&script_snippet
, "diffstat",
975 opts
->flags
& REBASE_DIFFSTAT
? "t" : "");
976 add_var(&script_snippet
, "force_rebase",
977 opts
->flags
& REBASE_FORCE
? "t" : "");
979 add_var(&script_snippet
, "switch_to", opts
->switch_to
);
980 add_var(&script_snippet
, "action", opts
->action
? opts
->action
: "");
981 add_var(&script_snippet
, "signoff", opts
->signoff
? "--signoff" : "");
982 add_var(&script_snippet
, "allow_rerere_autoupdate",
983 opts
->allow_rerere_autoupdate
?
984 opts
->allow_rerere_autoupdate
== RERERE_AUTOUPDATE
?
985 "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
986 add_var(&script_snippet
, "autosquash", opts
->autosquash
? "t" : "");
987 add_var(&script_snippet
, "gpg_sign_opt", opts
->gpg_sign_opt
);
988 add_var(&script_snippet
, "cmd", opts
->cmd
);
989 add_var(&script_snippet
, "allow_empty_message",
990 opts
->allow_empty_message
? "--allow-empty-message" : "");
991 add_var(&script_snippet
, "rebase_merges",
992 opts
->rebase_merges
? "t" : "");
993 add_var(&script_snippet
, "rebase_cousins",
994 opts
->rebase_cousins
? "t" : "");
995 add_var(&script_snippet
, "strategy", opts
->strategy
);
996 add_var(&script_snippet
, "strategy_opts", opts
->strategy_opts
);
997 add_var(&script_snippet
, "rebase_root", opts
->root
? "t" : "");
998 add_var(&script_snippet
, "squash_onto",
999 opts
->squash_onto
? oid_to_hex(opts
->squash_onto
) : "");
1000 add_var(&script_snippet
, "git_format_patch_opt",
1001 opts
->git_format_patch_opt
.buf
);
1003 if (is_merge(opts
) &&
1004 !(opts
->flags
& REBASE_INTERACTIVE_EXPLICIT
)) {
1005 strbuf_addstr(&script_snippet
,
1006 "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
1007 opts
->autosquash
= 0;
1010 switch (opts
->type
) {
1011 case REBASE_PRESERVE_MERGES
:
1012 backend
= "git-rebase--preserve-merges";
1013 backend_func
= "git_rebase__preserve_merges";
1016 BUG("Unhandled rebase type %d", opts
->type
);
1020 strbuf_addf(&script_snippet
,
1021 ". git-sh-setup && . %s && %s", backend
, backend_func
);
1022 argv
[0] = script_snippet
.buf
;
1024 status
= run_command_v_opt(argv
, RUN_USING_SHELL
);
1026 if (opts
->dont_finish_rebase
)
1028 else if (opts
->type
== REBASE_MERGE
)
1029 ; /* merge backend cleans up after itself */
1030 else if (status
== 0) {
1031 if (!file_exists(state_dir_path("stopped-sha", opts
)))
1032 finish_rebase(opts
);
1033 } else if (status
== 2) {
1034 struct strbuf dir
= STRBUF_INIT
;
1036 apply_autostash(state_dir_path("autostash", opts
));
1037 strbuf_addstr(&dir
, opts
->state_dir
);
1038 remove_dir_recursively(&dir
, 0);
1039 strbuf_release(&dir
);
1040 die("Nothing to do");
1043 strbuf_release(&script_snippet
);
1045 return status
? -1 : 0;
1048 static int rebase_config(const char *var
, const char *value
, void *data
)
1050 struct rebase_options
*opts
= data
;
1052 if (!strcmp(var
, "rebase.stat")) {
1053 if (git_config_bool(var
, value
))
1054 opts
->flags
|= REBASE_DIFFSTAT
;
1056 opts
->flags
&= ~REBASE_DIFFSTAT
;
1060 if (!strcmp(var
, "rebase.autosquash")) {
1061 opts
->autosquash
= git_config_bool(var
, value
);
1065 if (!strcmp(var
, "commit.gpgsign")) {
1066 free(opts
->gpg_sign_opt
);
1067 opts
->gpg_sign_opt
= git_config_bool(var
, value
) ?
1068 xstrdup("-S") : NULL
;
1072 if (!strcmp(var
, "rebase.autostash")) {
1073 opts
->autostash
= git_config_bool(var
, value
);
1077 if (!strcmp(var
, "rebase.reschedulefailedexec")) {
1078 opts
->reschedule_failed_exec
= git_config_bool(var
, value
);
1082 if (!strcmp(var
, "rebase.usebuiltin")) {
1083 opts
->use_legacy_rebase
= !git_config_bool(var
, value
);
1087 if (!strcmp(var
, "rebase.backend")) {
1088 return git_config_string(&opts
->default_backend
, var
, value
);
1091 return git_default_config(var
, value
, data
);
1095 * Determines whether the commits in from..to are linear, i.e. contain
1096 * no merge commits. This function *expects* `from` to be an ancestor of
1099 static int is_linear_history(struct commit
*from
, struct commit
*to
)
1101 while (to
&& to
!= from
) {
1105 if (to
->parents
->next
)
1107 to
= to
->parents
->item
;
1112 static int can_fast_forward(struct commit
*onto
, struct commit
*upstream
,
1113 struct commit
*restrict_revision
,
1114 struct object_id
*head_oid
, struct object_id
*merge_base
)
1116 struct commit
*head
= lookup_commit(the_repository
, head_oid
);
1117 struct commit_list
*merge_bases
= NULL
;
1123 merge_bases
= get_merge_bases(onto
, head
);
1124 if (!merge_bases
|| merge_bases
->next
) {
1125 oidcpy(merge_base
, &null_oid
);
1129 oidcpy(merge_base
, &merge_bases
->item
->object
.oid
);
1130 if (!oideq(merge_base
, &onto
->object
.oid
))
1133 if (restrict_revision
&& !oideq(&restrict_revision
->object
.oid
, merge_base
))
1139 free_commit_list(merge_bases
);
1140 merge_bases
= get_merge_bases(upstream
, head
);
1141 if (!merge_bases
|| merge_bases
->next
)
1144 if (!oideq(&onto
->object
.oid
, &merge_bases
->item
->object
.oid
))
1150 free_commit_list(merge_bases
);
1151 return res
&& is_linear_history(onto
, head
);
1154 static int parse_opt_am(const struct option
*opt
, const char *arg
, int unset
)
1156 struct rebase_options
*opts
= opt
->value
;
1158 BUG_ON_OPT_NEG(unset
);
1159 BUG_ON_OPT_ARG(arg
);
1161 opts
->type
= REBASE_APPLY
;
1166 /* -i followed by -m is still -i */
1167 static int parse_opt_merge(const struct option
*opt
, const char *arg
, int unset
)
1169 struct rebase_options
*opts
= opt
->value
;
1171 BUG_ON_OPT_NEG(unset
);
1172 BUG_ON_OPT_ARG(arg
);
1174 if (!is_merge(opts
))
1175 opts
->type
= REBASE_MERGE
;
1180 /* -i followed by -p is still explicitly interactive, but -p alone is not */
1181 static int parse_opt_interactive(const struct option
*opt
, const char *arg
,
1184 struct rebase_options
*opts
= opt
->value
;
1186 BUG_ON_OPT_NEG(unset
);
1187 BUG_ON_OPT_ARG(arg
);
1189 opts
->type
= REBASE_MERGE
;
1190 opts
->flags
|= REBASE_INTERACTIVE_EXPLICIT
;
1195 static enum empty_type
parse_empty_value(const char *value
)
1197 if (!strcasecmp(value
, "drop"))
1199 else if (!strcasecmp(value
, "keep"))
1201 else if (!strcasecmp(value
, "ask"))
1204 die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value
);
1207 static int parse_opt_empty(const struct option
*opt
, const char *arg
, int unset
)
1209 struct rebase_options
*options
= opt
->value
;
1210 enum empty_type value
= parse_empty_value(arg
);
1212 BUG_ON_OPT_NEG(unset
);
1214 options
->empty
= value
;
1218 static void NORETURN
error_on_missing_default_upstream(void)
1220 struct branch
*current_branch
= branch_get(NULL
);
1223 "Please specify which branch you want to rebase against.\n"
1224 "See git-rebase(1) for details.\n"
1226 " git rebase '<branch>'\n"
1228 current_branch
? _("There is no tracking information for "
1229 "the current branch.") :
1230 _("You are not currently on a branch."));
1232 if (current_branch
) {
1233 const char *remote
= current_branch
->remote_name
;
1236 remote
= _("<remote>");
1238 printf(_("If you wish to set tracking information for this "
1239 "branch you can do so with:\n"
1241 " git branch --set-upstream-to=%s/<branch> %s\n"
1243 remote
, current_branch
->name
);
1248 static void set_reflog_action(struct rebase_options
*options
)
1251 struct strbuf buf
= STRBUF_INIT
;
1253 if (!is_merge(options
))
1256 env
= getenv(GIT_REFLOG_ACTION_ENVIRONMENT
);
1257 if (env
&& strcmp("rebase", env
))
1258 return; /* only override it if it is "rebase" */
1260 strbuf_addf(&buf
, "rebase (%s)", options
->action
);
1261 setenv(GIT_REFLOG_ACTION_ENVIRONMENT
, buf
.buf
, 1);
1262 strbuf_release(&buf
);
1265 static int check_exec_cmd(const char *cmd
)
1267 if (strchr(cmd
, '\n'))
1268 return error(_("exec commands cannot contain newlines"));
1270 /* Does the command consist purely of whitespace? */
1271 if (!cmd
[strspn(cmd
, " \t\r\f\v")])
1272 return error(_("empty exec command"));
1277 int cmd_rebase(int argc
, const char **argv
, const char *prefix
)
1279 struct rebase_options options
= REBASE_OPTIONS_INIT
;
1280 const char *branch_name
;
1281 int ret
, flags
, total_argc
, in_progress
= 0;
1283 int ok_to_skip_pre_rebase
= 0;
1284 struct strbuf msg
= STRBUF_INIT
;
1285 struct strbuf revisions
= STRBUF_INIT
;
1286 struct strbuf buf
= STRBUF_INIT
;
1287 struct object_id merge_base
;
1288 enum action action
= ACTION_NONE
;
1289 const char *gpg_sign
= NULL
;
1290 struct string_list exec
= STRING_LIST_INIT_NODUP
;
1291 const char *rebase_merges
= NULL
;
1292 int fork_point
= -1;
1293 struct string_list strategy_options
= STRING_LIST_INIT_NODUP
;
1294 struct object_id squash_onto
;
1295 char *squash_onto_name
= NULL
;
1296 int reschedule_failed_exec
= -1;
1297 int allow_preemptive_ff
= 1;
1298 struct option builtin_rebase_options
[] = {
1299 OPT_STRING(0, "onto", &options
.onto_name
,
1301 N_("rebase onto given branch instead of upstream")),
1302 OPT_BOOL(0, "keep-base", &keep_base
,
1303 N_("use the merge-base of upstream and branch as the current base")),
1304 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase
,
1305 N_("allow pre-rebase hook to run")),
1306 OPT_NEGBIT('q', "quiet", &options
.flags
,
1307 N_("be quiet. implies --no-stat"),
1308 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
1309 OPT_BIT('v', "verbose", &options
.flags
,
1310 N_("display a diffstat of what changed upstream"),
1311 REBASE_NO_QUIET
| REBASE_VERBOSE
| REBASE_DIFFSTAT
),
1312 {OPTION_NEGBIT
, 'n', "no-stat", &options
.flags
, NULL
,
1313 N_("do not show diffstat of what changed upstream"),
1314 PARSE_OPT_NOARG
, NULL
, REBASE_DIFFSTAT
},
1315 OPT_BOOL(0, "signoff", &options
.signoff
,
1316 N_("add a Signed-off-by: line to each commit")),
1317 OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options
.git_am_opts
,
1318 NULL
, N_("passed to 'git am'"),
1320 OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
1321 &options
.git_am_opts
, NULL
,
1322 N_("passed to 'git am'"), PARSE_OPT_NOARG
),
1323 OPT_PASSTHRU_ARGV(0, "ignore-date", &options
.git_am_opts
, NULL
,
1324 N_("passed to 'git am'"), PARSE_OPT_NOARG
),
1325 OPT_PASSTHRU_ARGV('C', NULL
, &options
.git_am_opts
, N_("n"),
1326 N_("passed to 'git apply'"), 0),
1327 OPT_PASSTHRU_ARGV(0, "whitespace", &options
.git_am_opts
,
1328 N_("action"), N_("passed to 'git apply'"), 0),
1329 OPT_BIT('f', "force-rebase", &options
.flags
,
1330 N_("cherry-pick all commits, even if unchanged"),
1332 OPT_BIT(0, "no-ff", &options
.flags
,
1333 N_("cherry-pick all commits, even if unchanged"),
1335 OPT_CMDMODE(0, "continue", &action
, N_("continue"),
1337 OPT_CMDMODE(0, "skip", &action
,
1338 N_("skip current patch and continue"), ACTION_SKIP
),
1339 OPT_CMDMODE(0, "abort", &action
,
1340 N_("abort and check out the original branch"),
1342 OPT_CMDMODE(0, "quit", &action
,
1343 N_("abort but keep HEAD where it is"), ACTION_QUIT
),
1344 OPT_CMDMODE(0, "edit-todo", &action
, N_("edit the todo list "
1345 "during an interactive rebase"), ACTION_EDIT_TODO
),
1346 OPT_CMDMODE(0, "show-current-patch", &action
,
1347 N_("show the patch file being applied or merged"),
1348 ACTION_SHOW_CURRENT_PATCH
),
1349 { OPTION_CALLBACK
, 0, "apply", &options
, NULL
,
1350 N_("use apply strategies to rebase"),
1351 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1353 { OPTION_CALLBACK
, 'm', "merge", &options
, NULL
,
1354 N_("use merging strategies to rebase"),
1355 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1357 { OPTION_CALLBACK
, 'i', "interactive", &options
, NULL
,
1358 N_("let the user edit the list of commits to rebase"),
1359 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1360 parse_opt_interactive
},
1361 OPT_SET_INT_F('p', "preserve-merges", &options
.type
,
1362 N_("(DEPRECATED) try to recreate merges instead of "
1364 REBASE_PRESERVE_MERGES
, PARSE_OPT_HIDDEN
),
1365 OPT_RERERE_AUTOUPDATE(&options
.allow_rerere_autoupdate
),
1366 OPT_CALLBACK_F(0, "empty", &options
, "{drop,keep,ask}",
1367 N_("how to handle commits that become empty"),
1368 PARSE_OPT_NONEG
, parse_opt_empty
),
1369 { OPTION_CALLBACK
, 'k', "keep-empty", &options
, NULL
,
1370 N_("(DEPRECATED) keep empty commits"),
1371 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
,
1372 parse_opt_keep_empty
},
1373 OPT_BOOL(0, "autosquash", &options
.autosquash
,
1374 N_("move commits that begin with "
1375 "squash!/fixup! under -i")),
1376 { OPTION_STRING
, 'S', "gpg-sign", &gpg_sign
, N_("key-id"),
1377 N_("GPG-sign commits"),
1378 PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
1379 OPT_AUTOSTASH(&options
.autostash
),
1380 OPT_STRING_LIST('x', "exec", &exec
, N_("exec"),
1381 N_("add exec lines after each commit of the "
1383 OPT_BOOL_F(0, "allow-empty-message",
1384 &options
.allow_empty_message
,
1385 N_("allow rebasing commits with empty messages"),
1387 {OPTION_STRING
, 'r', "rebase-merges", &rebase_merges
,
1389 N_("try to rebase merges instead of skipping them"),
1390 PARSE_OPT_OPTARG
, NULL
, (intptr_t)""},
1391 OPT_BOOL(0, "fork-point", &fork_point
,
1392 N_("use 'merge-base --fork-point' to refine upstream")),
1393 OPT_STRING('s', "strategy", &options
.strategy
,
1394 N_("strategy"), N_("use the given merge strategy")),
1395 OPT_STRING_LIST('X', "strategy-option", &strategy_options
,
1397 N_("pass the argument through to the merge "
1399 OPT_BOOL(0, "root", &options
.root
,
1400 N_("rebase all reachable commits up to the root(s)")),
1401 OPT_BOOL(0, "reschedule-failed-exec",
1402 &reschedule_failed_exec
,
1403 N_("automatically re-schedule any `exec` that fails")),
1408 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1409 usage_with_options(builtin_rebase_usage
,
1410 builtin_rebase_options
);
1412 options
.allow_empty_message
= 1;
1413 git_config(rebase_config
, &options
);
1415 if (options
.use_legacy_rebase
||
1416 !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
1417 warning(_("the rebase.useBuiltin support has been removed!\n"
1418 "See its entry in 'git help config' for details."));
1421 strbuf_addf(&buf
, "%s/applying", apply_dir());
1422 if(file_exists(buf
.buf
))
1423 die(_("It looks like 'git am' is in progress. Cannot rebase."));
1425 if (is_directory(apply_dir())) {
1426 options
.type
= REBASE_APPLY
;
1427 options
.state_dir
= apply_dir();
1428 } else if (is_directory(merge_dir())) {
1430 strbuf_addf(&buf
, "%s/rewritten", merge_dir());
1431 if (is_directory(buf
.buf
)) {
1432 options
.type
= REBASE_PRESERVE_MERGES
;
1433 options
.flags
|= REBASE_INTERACTIVE_EXPLICIT
;
1436 strbuf_addf(&buf
, "%s/interactive", merge_dir());
1437 if(file_exists(buf
.buf
)) {
1438 options
.type
= REBASE_MERGE
;
1439 options
.flags
|= REBASE_INTERACTIVE_EXPLICIT
;
1441 options
.type
= REBASE_MERGE
;
1443 options
.state_dir
= merge_dir();
1446 if (options
.type
!= REBASE_UNSPECIFIED
)
1450 argc
= parse_options(argc
, argv
, prefix
,
1451 builtin_rebase_options
,
1452 builtin_rebase_usage
, 0);
1454 if (action
!= ACTION_NONE
&& total_argc
!= 2) {
1455 usage_with_options(builtin_rebase_usage
,
1456 builtin_rebase_options
);
1460 usage_with_options(builtin_rebase_usage
,
1461 builtin_rebase_options
);
1463 if (options
.type
== REBASE_PRESERVE_MERGES
)
1464 warning(_("git rebase --preserve-merges is deprecated. "
1465 "Use --rebase-merges instead."));
1468 if (options
.onto_name
)
1469 die(_("cannot combine '--keep-base' with '--onto'"));
1471 die(_("cannot combine '--keep-base' with '--root'"));
1474 if (action
!= ACTION_NONE
&& !in_progress
)
1475 die(_("No rebase in progress?"));
1476 setenv(GIT_REFLOG_ACTION_ENVIRONMENT
, "rebase", 0);
1478 if (action
== ACTION_EDIT_TODO
&& !is_merge(&options
))
1479 die(_("The --edit-todo action can only be used during "
1480 "interactive rebase."));
1482 if (trace2_is_enabled()) {
1483 if (is_merge(&options
))
1484 trace2_cmd_mode("interactive");
1486 trace2_cmd_mode("interactive-exec");
1488 trace2_cmd_mode(action_names
[action
]);
1492 case ACTION_CONTINUE
: {
1493 struct object_id head
;
1494 struct lock_file lock_file
= LOCK_INIT
;
1497 options
.action
= "continue";
1498 set_reflog_action(&options
);
1501 if (get_oid("HEAD", &head
))
1502 die(_("Cannot read HEAD"));
1504 fd
= hold_locked_index(&lock_file
, 0);
1505 if (repo_read_index(the_repository
) < 0)
1506 die(_("could not read index"));
1507 refresh_index(the_repository
->index
, REFRESH_QUIET
, NULL
, NULL
,
1510 repo_update_index_if_able(the_repository
, &lock_file
);
1511 rollback_lock_file(&lock_file
);
1513 if (has_unstaged_changes(the_repository
, 1)) {
1514 puts(_("You must edit all merge conflicts and then\n"
1515 "mark them as resolved using git add"));
1518 if (read_basic_state(&options
))
1523 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1525 options
.action
= "skip";
1526 set_reflog_action(&options
);
1528 rerere_clear(the_repository
, &merge_rr
);
1529 string_list_clear(&merge_rr
, 1);
1531 if (reset_head(the_repository
, NULL
, "reset", NULL
, RESET_HEAD_HARD
,
1532 NULL
, NULL
, DEFAULT_REFLOG_ACTION
) < 0)
1533 die(_("could not discard worktree changes"));
1534 remove_branch_state(the_repository
, 0);
1535 if (read_basic_state(&options
))
1539 case ACTION_ABORT
: {
1540 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1541 options
.action
= "abort";
1542 set_reflog_action(&options
);
1544 rerere_clear(the_repository
, &merge_rr
);
1545 string_list_clear(&merge_rr
, 1);
1547 if (read_basic_state(&options
))
1549 if (reset_head(the_repository
, &options
.orig_head
, "reset",
1550 options
.head_name
, RESET_HEAD_HARD
,
1551 NULL
, NULL
, DEFAULT_REFLOG_ACTION
) < 0)
1552 die(_("could not move back to %s"),
1553 oid_to_hex(&options
.orig_head
));
1554 remove_branch_state(the_repository
, 0);
1555 ret
= !!finish_rebase(&options
);
1559 if (options
.type
== REBASE_MERGE
) {
1560 struct replay_opts replay
= REPLAY_OPTS_INIT
;
1562 replay
.action
= REPLAY_INTERACTIVE_REBASE
;
1563 ret
= !!sequencer_remove_state(&replay
);
1566 strbuf_addstr(&buf
, options
.state_dir
);
1567 ret
= !!remove_dir_recursively(&buf
, 0);
1569 error(_("could not remove '%s'"),
1574 case ACTION_EDIT_TODO
:
1575 options
.action
= "edit-todo";
1576 options
.dont_finish_rebase
= 1;
1578 case ACTION_SHOW_CURRENT_PATCH
:
1579 options
.action
= "show-current-patch";
1580 options
.dont_finish_rebase
= 1;
1585 BUG("action: %d", action
);
1588 /* Make sure no rebase is in progress */
1590 const char *last_slash
= strrchr(options
.state_dir
, '/');
1591 const char *state_dir_base
=
1592 last_slash
? last_slash
+ 1 : options
.state_dir
;
1593 const char *cmd_live_rebase
=
1594 "git rebase (--continue | --abort | --skip)";
1596 strbuf_addf(&buf
, "rm -fr \"%s\"", options
.state_dir
);
1597 die(_("It seems that there is already a %s directory, and\n"
1598 "I wonder if you are in the middle of another rebase. "
1600 "case, please try\n\t%s\n"
1601 "If that is not the case, please\n\t%s\n"
1602 "and run me again. I am stopping in case you still "
1604 "valuable there.\n"),
1605 state_dir_base
, cmd_live_rebase
, buf
.buf
);
1608 if ((options
.flags
& REBASE_INTERACTIVE_EXPLICIT
) ||
1609 (action
!= ACTION_NONE
) ||
1611 options
.autosquash
) {
1612 allow_preemptive_ff
= 0;
1615 for (i
= 0; i
< options
.git_am_opts
.argc
; i
++) {
1616 const char *option
= options
.git_am_opts
.argv
[i
], *p
;
1617 if (!strcmp(option
, "--committer-date-is-author-date") ||
1618 !strcmp(option
, "--ignore-date") ||
1619 !strcmp(option
, "--whitespace=fix") ||
1620 !strcmp(option
, "--whitespace=strip"))
1621 allow_preemptive_ff
= 0;
1622 else if (skip_prefix(option
, "-C", &p
)) {
1624 if (!isdigit(*(p
++)))
1625 die(_("switch `C' expects a "
1626 "numerical value"));
1627 } else if (skip_prefix(option
, "--whitespace=", &p
)) {
1628 if (*p
&& strcmp(p
, "warn") && strcmp(p
, "nowarn") &&
1629 strcmp(p
, "error") && strcmp(p
, "error-all"))
1630 die("Invalid whitespace option: '%s'", p
);
1634 for (i
= 0; i
< exec
.nr
; i
++)
1635 if (check_exec_cmd(exec
.items
[i
].string
))
1638 if (!(options
.flags
& REBASE_NO_QUIET
))
1639 argv_array_push(&options
.git_am_opts
, "-q");
1641 if (options
.empty
!= EMPTY_UNSPECIFIED
)
1642 imply_merge(&options
, "--empty");
1645 free(options
.gpg_sign_opt
);
1646 options
.gpg_sign_opt
= xstrfmt("-S%s", gpg_sign
);
1652 imply_merge(&options
, "--exec");
1655 for (i
= 0; i
< exec
.nr
; i
++)
1656 strbuf_addf(&buf
, "exec %s\n", exec
.items
[i
].string
);
1657 options
.cmd
= xstrdup(buf
.buf
);
1660 if (rebase_merges
) {
1661 if (!*rebase_merges
)
1662 ; /* default mode; do nothing */
1663 else if (!strcmp("rebase-cousins", rebase_merges
))
1664 options
.rebase_cousins
= 1;
1665 else if (strcmp("no-rebase-cousins", rebase_merges
))
1666 die(_("Unknown mode: %s"), rebase_merges
);
1667 options
.rebase_merges
= 1;
1668 imply_merge(&options
, "--rebase-merges");
1671 if (strategy_options
.nr
) {
1674 if (!options
.strategy
)
1675 options
.strategy
= "recursive";
1678 for (i
= 0; i
< strategy_options
.nr
; i
++)
1679 strbuf_addf(&buf
, " --%s",
1680 strategy_options
.items
[i
].string
);
1681 options
.strategy_opts
= xstrdup(buf
.buf
);
1684 if (options
.strategy
) {
1685 options
.strategy
= xstrdup(options
.strategy
);
1686 switch (options
.type
) {
1688 die(_("--strategy requires --merge or --interactive"));
1690 case REBASE_PRESERVE_MERGES
:
1693 case REBASE_UNSPECIFIED
:
1694 options
.type
= REBASE_MERGE
;
1697 BUG("unhandled rebase type (%d)", options
.type
);
1701 if (options
.type
== REBASE_MERGE
)
1702 imply_merge(&options
, "--merge");
1704 if (options
.root
&& !options
.onto_name
)
1705 imply_merge(&options
, "--root without --onto");
1707 if (isatty(2) && options
.flags
& REBASE_NO_QUIET
)
1708 strbuf_addstr(&options
.git_format_patch_opt
, " --progress");
1710 if (options
.git_am_opts
.argc
|| options
.type
== REBASE_APPLY
) {
1711 /* all am options except -q are compatible only with --apply */
1712 for (i
= options
.git_am_opts
.argc
- 1; i
>= 0; i
--)
1713 if (strcmp(options
.git_am_opts
.argv
[i
], "-q"))
1717 if (is_merge(&options
))
1718 die(_("cannot combine apply options with "
1721 options
.type
= REBASE_APPLY
;
1725 if (options
.type
== REBASE_UNSPECIFIED
) {
1726 if (!strcmp(options
.default_backend
, "merge"))
1727 imply_merge(&options
, "--merge");
1728 else if (!strcmp(options
.default_backend
, "apply"))
1729 options
.type
= REBASE_APPLY
;
1731 die(_("Unknown rebase backend: %s"),
1732 options
.default_backend
);
1735 switch (options
.type
) {
1737 case REBASE_PRESERVE_MERGES
:
1738 options
.state_dir
= merge_dir();
1741 options
.state_dir
= apply_dir();
1744 BUG("options.type was just set above; should be unreachable.");
1747 if (options
.empty
== EMPTY_UNSPECIFIED
) {
1748 if (options
.flags
& REBASE_INTERACTIVE_EXPLICIT
)
1749 options
.empty
= EMPTY_ASK
;
1750 else if (exec
.nr
> 0)
1751 options
.empty
= EMPTY_KEEP
;
1753 options
.empty
= EMPTY_DROP
;
1755 if (reschedule_failed_exec
> 0 && !is_merge(&options
))
1756 die(_("--reschedule-failed-exec requires "
1757 "--exec or --interactive"));
1758 if (reschedule_failed_exec
>= 0)
1759 options
.reschedule_failed_exec
= reschedule_failed_exec
;
1761 if (options
.signoff
) {
1762 if (options
.type
== REBASE_PRESERVE_MERGES
)
1763 die("cannot combine '--signoff' with "
1764 "'--preserve-merges'");
1765 argv_array_push(&options
.git_am_opts
, "--signoff");
1766 options
.flags
|= REBASE_FORCE
;
1769 if (options
.type
== REBASE_PRESERVE_MERGES
) {
1771 * Note: incompatibility with --signoff handled in signoff block above
1772 * Note: incompatibility with --interactive is just a strong warning;
1773 * git-rebase.txt caveats with "unless you know what you are doing"
1775 if (options
.rebase_merges
)
1776 die(_("cannot combine '--preserve-merges' with "
1777 "'--rebase-merges'"));
1779 if (options
.reschedule_failed_exec
)
1780 die(_("error: cannot combine '--preserve-merges' with "
1781 "'--reschedule-failed-exec'"));
1784 if (!options
.root
) {
1786 struct branch
*branch
;
1788 branch
= branch_get(NULL
);
1789 options
.upstream_name
= branch_get_upstream(branch
,
1791 if (!options
.upstream_name
)
1792 error_on_missing_default_upstream();
1796 options
.upstream_name
= argv
[0];
1799 if (!strcmp(options
.upstream_name
, "-"))
1800 options
.upstream_name
= "@{-1}";
1802 options
.upstream
= peel_committish(options
.upstream_name
);
1803 if (!options
.upstream
)
1804 die(_("invalid upstream '%s'"), options
.upstream_name
);
1805 options
.upstream_arg
= options
.upstream_name
;
1807 if (!options
.onto_name
) {
1808 if (commit_tree("", 0, the_hash_algo
->empty_tree
, NULL
,
1809 &squash_onto
, NULL
, NULL
) < 0)
1810 die(_("Could not create new root commit"));
1811 options
.squash_onto
= &squash_onto
;
1812 options
.onto_name
= squash_onto_name
=
1813 xstrdup(oid_to_hex(&squash_onto
));
1815 options
.root_with_onto
= 1;
1817 options
.upstream_name
= NULL
;
1818 options
.upstream
= NULL
;
1820 usage_with_options(builtin_rebase_usage
,
1821 builtin_rebase_options
);
1822 options
.upstream_arg
= "--root";
1825 /* Make sure the branch to rebase onto is valid. */
1828 strbuf_addstr(&buf
, options
.upstream_name
);
1829 strbuf_addstr(&buf
, "...");
1830 options
.onto_name
= xstrdup(buf
.buf
);
1831 } else if (!options
.onto_name
)
1832 options
.onto_name
= options
.upstream_name
;
1833 if (strstr(options
.onto_name
, "...")) {
1834 if (get_oid_mb(options
.onto_name
, &merge_base
) < 0) {
1836 die(_("'%s': need exactly one merge base with branch"),
1837 options
.upstream_name
);
1839 die(_("'%s': need exactly one merge base"),
1842 options
.onto
= lookup_commit_or_die(&merge_base
,
1845 options
.onto
= peel_committish(options
.onto_name
);
1847 die(_("Does not point to a valid commit '%s'"),
1852 * If the branch to rebase is given, that is the branch we will rebase
1853 * branch_name -- branch/commit being rebased, or
1854 * HEAD (already detached)
1855 * orig_head -- commit object name of tip of the branch before rebasing
1856 * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
1859 /* Is it "rebase other branchname" or "rebase other commit"? */
1860 branch_name
= argv
[0];
1861 options
.switch_to
= argv
[0];
1863 /* Is it a local branch? */
1865 strbuf_addf(&buf
, "refs/heads/%s", branch_name
);
1866 if (!read_ref(buf
.buf
, &options
.orig_head
)) {
1867 die_if_checked_out(buf
.buf
, 1);
1868 options
.head_name
= xstrdup(buf
.buf
);
1869 /* If not is it a valid ref (branch or commit)? */
1870 } else if (!get_oid(branch_name
, &options
.orig_head
))
1871 options
.head_name
= NULL
;
1873 die(_("fatal: no such branch/commit '%s'"),
1875 } else if (argc
== 0) {
1876 /* Do not need to switch branches, we are already on it. */
1878 xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL
,
1880 if (!options
.head_name
)
1881 die(_("No such ref: %s"), "HEAD");
1882 if (flags
& REF_ISSYMREF
) {
1883 if (!skip_prefix(options
.head_name
,
1884 "refs/heads/", &branch_name
))
1885 branch_name
= options
.head_name
;
1888 FREE_AND_NULL(options
.head_name
);
1889 branch_name
= "HEAD";
1891 if (get_oid("HEAD", &options
.orig_head
))
1892 die(_("Could not resolve HEAD to a revision"));
1894 BUG("unexpected number of arguments left to parse");
1896 if (fork_point
> 0) {
1897 struct commit
*head
=
1898 lookup_commit_reference(the_repository
,
1899 &options
.orig_head
);
1900 options
.restrict_revision
=
1901 get_fork_point(options
.upstream_name
, head
);
1904 if (repo_read_index(the_repository
) < 0)
1905 die(_("could not read index"));
1907 if (options
.autostash
) {
1908 create_autostash(the_repository
, state_dir_path("autostash", &options
),
1909 DEFAULT_REFLOG_ACTION
);
1912 if (require_clean_work_tree(the_repository
, "rebase",
1913 _("Please commit or stash them."), 1, 1)) {
1919 * Now we are rebasing commits upstream..orig_head (or with --root,
1920 * everything leading up to orig_head) on top of onto.
1924 * Check if we are already based on onto with linear history,
1925 * in which case we could fast-forward without replacing the commits
1926 * with new commits recreated by replaying their changes.
1928 * Note that can_fast_forward() initializes merge_base, so we have to
1929 * call it before checking allow_preemptive_ff.
1931 if (can_fast_forward(options
.onto
, options
.upstream
, options
.restrict_revision
,
1932 &options
.orig_head
, &merge_base
) &&
1933 allow_preemptive_ff
) {
1936 if (!(options
.flags
& REBASE_FORCE
)) {
1937 /* Lazily switch to the target branch if needed... */
1938 if (options
.switch_to
) {
1940 strbuf_addf(&buf
, "%s: checkout %s",
1941 getenv(GIT_REFLOG_ACTION_ENVIRONMENT
),
1943 if (reset_head(the_repository
,
1944 &options
.orig_head
, "checkout",
1946 RESET_HEAD_RUN_POST_CHECKOUT_HOOK
,
1948 DEFAULT_REFLOG_ACTION
) < 0) {
1949 ret
= !!error(_("could not switch to "
1956 if (!(options
.flags
& REBASE_NO_QUIET
))
1958 else if (!strcmp(branch_name
, "HEAD") &&
1959 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1960 puts(_("HEAD is up to date."));
1962 printf(_("Current branch %s is up to date.\n"),
1964 ret
= !!finish_rebase(&options
);
1966 } else if (!(options
.flags
& REBASE_NO_QUIET
))
1968 else if (!strcmp(branch_name
, "HEAD") &&
1969 resolve_ref_unsafe("HEAD", 0, NULL
, &flag
))
1970 puts(_("HEAD is up to date, rebase forced."));
1972 printf(_("Current branch %s is up to date, rebase "
1973 "forced.\n"), branch_name
);
1976 /* If a hook exists, give it a chance to interrupt*/
1977 if (!ok_to_skip_pre_rebase
&&
1978 run_hook_le(NULL
, "pre-rebase", options
.upstream_arg
,
1979 argc
? argv
[0] : NULL
, NULL
))
1980 die(_("The pre-rebase hook refused to rebase."));
1982 if (options
.flags
& REBASE_DIFFSTAT
) {
1983 struct diff_options opts
;
1985 if (options
.flags
& REBASE_VERBOSE
) {
1986 if (is_null_oid(&merge_base
))
1987 printf(_("Changes to %s:\n"),
1988 oid_to_hex(&options
.onto
->object
.oid
));
1990 printf(_("Changes from %s to %s:\n"),
1991 oid_to_hex(&merge_base
),
1992 oid_to_hex(&options
.onto
->object
.oid
));
1995 /* We want color (if set), but no pager */
1997 opts
.stat_width
= -1; /* use full terminal width */
1998 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
1999 opts
.output_format
|=
2000 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
2001 opts
.detect_rename
= DIFF_DETECT_RENAME
;
2002 diff_setup_done(&opts
);
2003 diff_tree_oid(is_null_oid(&merge_base
) ?
2004 the_hash_algo
->empty_tree
: &merge_base
,
2005 &options
.onto
->object
.oid
, "", &opts
);
2006 diffcore_std(&opts
);
2010 if (is_merge(&options
))
2013 /* Detach HEAD and reset the tree */
2014 if (options
.flags
& REBASE_NO_QUIET
)
2015 printf(_("First, rewinding head to replay your work on top of "
2018 strbuf_addf(&msg
, "%s: checkout %s",
2019 getenv(GIT_REFLOG_ACTION_ENVIRONMENT
), options
.onto_name
);
2020 if (reset_head(the_repository
, &options
.onto
->object
.oid
, "checkout", NULL
,
2021 RESET_HEAD_DETACH
| RESET_ORIG_HEAD
|
2022 RESET_HEAD_RUN_POST_CHECKOUT_HOOK
,
2023 NULL
, msg
.buf
, DEFAULT_REFLOG_ACTION
))
2024 die(_("Could not detach HEAD"));
2025 strbuf_release(&msg
);
2028 * If the onto is a proper descendant of the tip of the branch, then
2029 * we just fast-forwarded.
2032 if (oideq(&merge_base
, &options
.orig_head
)) {
2033 printf(_("Fast-forwarded %s to %s.\n"),
2034 branch_name
, options
.onto_name
);
2035 strbuf_addf(&msg
, "rebase finished: %s onto %s",
2036 options
.head_name
? options
.head_name
: "detached HEAD",
2037 oid_to_hex(&options
.onto
->object
.oid
));
2038 reset_head(the_repository
, NULL
, "Fast-forwarded", options
.head_name
,
2039 RESET_HEAD_REFS_ONLY
, "HEAD", msg
.buf
,
2040 DEFAULT_REFLOG_ACTION
);
2041 strbuf_release(&msg
);
2042 ret
= !!finish_rebase(&options
);
2046 strbuf_addf(&revisions
, "%s..%s",
2047 options
.root
? oid_to_hex(&options
.onto
->object
.oid
) :
2048 (options
.restrict_revision
?
2049 oid_to_hex(&options
.restrict_revision
->object
.oid
) :
2050 oid_to_hex(&options
.upstream
->object
.oid
)),
2051 oid_to_hex(&options
.orig_head
));
2053 options
.revisions
= revisions
.buf
;
2056 ret
= !!run_specific_rebase(&options
, action
);
2059 strbuf_release(&buf
);
2060 strbuf_release(&revisions
);
2061 free(options
.head_name
);
2062 free(options
.gpg_sign_opt
);
2064 free(squash_onto_name
);