From: Pratik Karki <predatoramigo@gmail.com>
Date: Wed, 8 Aug 2018 15:06:21 +0000 (+0545)
Subject: builtin rebase: actions require a rebase in progress
X-Git-Tag: v2.20.0-rc0~92^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d732a5707855d2cbe5c264b48a8884688a90b95b;p=thirdparty%2Fgit.git

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>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 12d34848bd..9238757443 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."));