From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Sep 2021 23:49:54 GMT
Subject: Re: [PATCH 3/7] ll-merge: add API for capturing warnings in a strbuf instead of stderr
Message-ID: <xmqqpmssgt0d.fsf@gitster.g>
In-Reply-To: <YVOZRhWttzF18Xql@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> I do wonder if the ll_merge() code should avoid calling warning() in the
> first place. It is after all, meant to be "low-level". We already return
> an error code from the function. I wonder if returning a more detailed
> code instead, like:
>
>   enum LL_MERGE_RESULT {
> 	LL_MERGE_OK = 0,
> 	LL_MERGE_CONFLICT,
> 	LL_MERGE_BINARY_CONFLICT,
>   };
>
> would let the caller do the sensible thing.

I like it better as a longer-term direction.