Skip to content

Commit d732a57

Browse files
prertikgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 51e9ea6 commit d732a57

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

builtin/rebase.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
577577
usage_with_options(builtin_rebase_usage,
578578
builtin_rebase_options);
579579

580+
if (action != NO_ACTION && !in_progress)
581+
die(_("No rebase in progress?"));
582+
580583
if (action == ACTION_EDIT_TODO && !is_interactive(&options))
581584
die(_("The --edit-todo action can only be used during "
582585
"interactive rebase."));

0 commit comments

Comments
 (0)