Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> writes:
> This makes sure that we get a properly translated message rather than
> inserting the command (which we failed to translate) into a generic
> fallback message.
Hmph, can this be accompanied with a change to add a test to an
existing test script to demonstrate that the function can be called
with me set to "rebase" and results in a generic message?
> We now also BUG() out when encountering an unexpected command.
This needs to be reviewed by somebody who is more familiar with the
rebase/chrry-pick/revert/sequencer codepaths so that they can give a
definitive "good--I know that we never call this function with any
other value in 'me'" and that person would not be me.
> Arguably, it would be cleaner to pass the command as an enum in the
> first place ...
True, but that can be left to a different topic, I would think.
Thanks.
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx>
> Cc: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> advice.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/advice.c b/advice.c
> index d6232439c3..c35ae82e7d 100644
> --- a/advice.c
> +++ b/advice.c
> @@ -190,9 +190,10 @@ int error_resolve_conflict(const char *me)
> error(_("Pulling is not possible because you have unmerged files."));
> else if (!strcmp(me, "revert"))
> error(_("Reverting is not possible because you have unmerged files."));
> + else if (!strcmp(me, "rebase"))
> + error(_("Rebasing is not possible because you have unmerged files."));
> else
> - error(_("It is not possible to %s because you have unmerged files."),
> - me);
> + BUG("Unhandled conflict reason '%s'", me);
>
> if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
> /*
