@matheusbsbs / matheus-bagliano / commits / 50ed76148a
Fork 0

rebase: fix an incompatible-options error message

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Apr 11, 2020 at 02:44 UTC 50ed76148a96d6cf37549c0492e6da1ff85b9bd0
1 file changed +1 -1
builtin/rebase.c
+1 -1
@@ -561,7 +561,7 @@ static void imply_merge(struct rebase_options *opts, const char *option)
561 {
562 switch (opts->type) {
563 case REBASE_APPLY:
564 - die(_("%s requires an interactive rebase"), option);
564 + die(_("%s requires the merge backend"), option);
565 break;
566 case REBASE_MERGE:
567 case REBASE_PRESERVE_MERGES: