builtin rebase: actions require a rebase in progress

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 12d34848bd979cc1fe082fa2a9426d9676d83f04..9238757443832d2ec4b50edead00e1d7ac03ac10 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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."));