[PATCH 6/7] builtin rebase: actions require a rebase in progress

From: Pratik Karki <predatoramigo@gmail.com>
Date: Aug 8, 2018, 15:06 UTC
Message-ID: <20180808150622.9614-7-predatoramigo@gmail.com>
In-Reply-To: <20180808150622.9614-1-predatoramigo@gmail.com>

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>
---
 builtin/rebase.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index e3dd2f511e..1344e071f3 100644
--- 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."));

-- 
2.18.0