[PATCH v3 3/4] rebase: fix an incompatible-options error message

From: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date: Apr 11, 2020, 02:44 UTC
Message-ID: <5c8863b9d349f1ea43ae397715ca39d263ee816d.1586573068.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.757.v3.git.git.1586573067.gitgitgadget@gmail.com>

From: Elijah Newren <newren@gmail.com>

When the user specifies the apply backend with options that only work with the merge backend, such as

    git rebase --apply --exec /bin/true HEAD~3

the error message has always been

    fatal: --exec requires an interactive rebase

This error message is misleading and was one of the reasons we renamed the interactive backend to the merge backend. Update the error message to state that these options merely require use of the merge backend.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 022aa2589a5..0e223a96d46 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -561,7 +561,7 @@ static void imply_merge(struct rebase_options *opts, const char *option)
 {
 	switch (opts->type) {
 	case REBASE_APPLY:
-		die(_("%s requires an interactive rebase"), option);
+		die(_("%s requires the merge backend"), option);
 		break;
 	case REBASE_MERGE:
 	case REBASE_PRESERVE_MERGES:

-- 
gitgitgadget