From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 06 Jul 2021 20:07:02 GMT
Subject: Re: [RFC PATCH 01/35] merge: improve fatal fast-forward message
Message-ID: <87bl7f5ho1.fsf@evledraar.gmail.com>
In-Reply-To: <20210705123209.1808663-2-felipe.contreras@gmail.com>


On Mon, Jul 05 2021, Felipe Contreras wrote:

> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>  builtin/merge.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index a8a843b1f5..05e631229d 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -1620,7 +1620,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>  	}
>  
>  	if (fast_forward == FF_ONLY)
> -		die(_("Not possible to fast-forward, aborting."));
> +		die(_("unable to fast-forward"));

I read the existing message a bit more like "this makes no sense
anymore" (correct) and the latter more like "we encountered an
error". Perhaps something like:

    "Can't merge X with Y, in --ff-only mode, would need to create a merge commit", tip_name