mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
builtin rebase: support --edit-todo and --show-current-patch
While these sub-commands are very different in spirit, their implementation is almost identical, so we convert them in one go. And since those are the last sub-commands that needed to be converted, now we can also turn that `default:` case into a bug (because we should now handle all the actions). Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5a61494539
commit
51e9ea6da7
|
@ -472,6 +472,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
ACTION_SKIP,
|
||||
ACTION_ABORT,
|
||||
ACTION_QUIT,
|
||||
ACTION_EDIT_TODO,
|
||||
ACTION_SHOW_CURRENT_PATCH,
|
||||
} action = NO_ACTION;
|
||||
struct option builtin_rebase_options[] = {
|
||||
OPT_STRING(0, "onto", &options.onto_name,
|
||||
|
@ -503,6 +505,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
ACTION_ABORT),
|
||||
OPT_CMDMODE(0, "quit", &action,
|
||||
N_("abort but keep HEAD where it is"), ACTION_QUIT),
|
||||
OPT_CMDMODE(0, "edit-todo", &action, N_("edit the todo list "
|
||||
"during an interactive rebase"), ACTION_EDIT_TODO),
|
||||
OPT_CMDMODE(0, "show-current-patch", &action,
|
||||
N_("show the patch file being applied or merged"),
|
||||
ACTION_SHOW_CURRENT_PATCH),
|
||||
OPT_END(),
|
||||
};
|
||||
|
||||
|
@ -570,6 +577,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
if (action == ACTION_EDIT_TODO && !is_interactive(&options))
|
||||
die(_("The --edit-todo action can only be used during "
|
||||
"interactive rebase."));
|
||||
|
||||
switch (action) {
|
||||
case ACTION_CONTINUE: {
|
||||
struct object_id head;
|
||||
|
@ -639,8 +650,18 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
die(_("could not remove '%s'"), options.state_dir);
|
||||
goto cleanup;
|
||||
}
|
||||
case ACTION_EDIT_TODO:
|
||||
options.action = "edit-todo";
|
||||
options.dont_finish_rebase = 1;
|
||||
goto run_rebase;
|
||||
case ACTION_SHOW_CURRENT_PATCH:
|
||||
options.action = "show-current-patch";
|
||||
options.dont_finish_rebase = 1;
|
||||
goto run_rebase;
|
||||
case NO_ACTION:
|
||||
break;
|
||||
default:
|
||||
die("TODO");
|
||||
BUG("action: %d", action);
|
||||
}
|
||||
|
||||
/* Make sure no rebase is in progress */
|
||||
|
|
Loading…
Reference in a new issue