From: Oswald Buddenhagen Date: Fri, 28 Apr 2023 12:56:47 GMT Subject: [PATCH v2 1/3] advice: handle "rebase" in error_resolve_conflict() Message-ID: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de> In-Reply-To: <20230323162234.995485-1-oswald.buddenhagen@gmx.de> 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. We now also BUG() out when encountering an unexpected command. Arguably, it would be cleaner to pass the command as an enum in the first place ... Signed-off-by: Oswald Buddenhagen Cc: Junio C Hamano --- 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)) /* -- 2.40.0.152.g15d061e6df