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>
Pratik Karki committed
Aug 8, 2018 at 20:51 UTC
d732a5707855d2cbe5c264b48a8884688a90b95b
1 file changed
+3
builtin/rebase.c
+3
@@ -577,6 +577,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
577
usage_with_options(builtin_rebase_usage,
578
builtin_rebase_options);
579
580
+ if (action != NO_ACTION && !in_progress)
581
+ die(_("No rebase in progress?"));
582
+
583
if (action == ACTION_EDIT_TODO && !is_interactive(&options))
584
die(_("The --edit-todo action can only be used during "
585
"interactive rebase."));