undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: fix an incompatible-options error message

Browse Source 
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>
This commit is contained in:
Elijah Newren 2020-04-11 02:44:26 +00:00 committed by Junio C Hamano
parent b9cbd2958f
commit 50ed76148a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@ -561,7 +561,7 @@ static void imply_merge(struct rebase_options *opts, const char *option)
{ {
switch (opts->type) { switch (opts->type) {
case REBASE_APPLY: case REBASE_APPLY:
die(_("%s requires an interactive rebase"), option); die(_("%s requires the merge backend"), option);
break; break;
case REBASE_MERGE: case REBASE_MERGE:
case REBASE_PRESERVE_MERGES: case REBASE_PRESERVE_MERGES: