mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
builtin rebase: actions require a rebase in progress
This commit prevents actions (such as --continue, --skip) from running when there is no rebase in progress. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
51e9ea6da7
commit
d732a57078
|
@ -577,6 +577,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
if (action != NO_ACTION && !in_progress)
|
||||
die(_("No rebase in progress?"));
|
||||
|
||||
if (action == ACTION_EDIT_TODO && !is_interactive(&options))
|
||||
die(_("The --edit-todo action can only be used during "
|
||||
"interactive rebase."));
|
||||
|
|
Loading…
Reference in a new issue