Re: [PATCH 0/1] Object ID support for git merge-file

From: Taylor Blau <me@ttaylorr.com>
Date: Oct 30, 2023, 15:54 UTC
Message-ID: <ZT/RpqvfQyx+uzxa@nand.local>
In-Reply-To: <CABPp-BFJn5NsSaaxEMpicqND_-8CBw370kyBQuKHGOX-3PRyMw@mail.gmail.com>

On Sat, Oct 28, 2023 at 11:24:06PM -0700, Elijah Newren wrote:

Show 8 quoted lines

> On Tue, Oct 24, 2023 at 12:58 PM brian m. carlson
> <sandals@crustytoothpaste.net> wrote:
> >
> > This series introduces an --object-id option to git merge-file such
> > that, instead of reading and writing from files on the system, it reads
> > from and writes to the object store using blobs.
>
> This seems like a reasonable capability to want from such a plumbing command.

Agreed.

Show 7 quoted lines

> > This is in use at
> > GitHub to produce conflict diffs when a merge fails, and it seems
> > generally useful, so I'm sending it here.
>
> But...wouldn't you already have the conflicts generated when doing the
> merge and learning that it fails?  Why would you need to generate them
> again?

brian would know better than I do, but I believe the reason is because the "attempt this merge" RPC is handled separately from the "show me the merge conflict(s) at xyz path". Those probably could be combined (obviating the need for this patch), but doing so is probably rather complicated.

Since this feature is generally useful for callers that haven't already completed a tree-level merge and really just care about the result of merging a single path, I don't have any objections here.

Thanks, Taylor