Re: [PATCH 00/19] Cleanup merge API

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 25, 2019, 18:12 UTC
Message-ID: <xmqqblxioufc.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190725174611.14802-1-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 10 quoted lines

> Before writing a replacement merge strategy for recursive, I decided
> to first cleanup the merge API -- streamlining merge-recursive.h and
> making it more readable.  It includes some fixes I noticed along the
> way, and the last two patches were some forgotten changes of mine I
> rediscovered that had minor textual conflicts before I rebased them on
> this series.
>
>     While there are minor textual and semantic dependencies between
>     these patches (preventing me from splitting up this series), they
>     are logically separate and can be reviewed independently.

Nice.

Show 5 quoted lines

> Stuff I'd most welcome review on:
>   * Is cache-tree.c the right place for write_tree_from_memory()?
>     [see patch 7]  Should there be docs on how it differs from
>     write_index_as_tree(), already found in cache-tree?  What does
>     the latter even do?

write_index_as_tree() is supposed to write the contents of an index state as a tree object, and return the object ID for the resulting tree. It is the primary interface designed to be used by write-tree.

> Stuff I didn't address:
>   * All current callers (3 of them?) of merge_recursive() always pass
>     ... I'm guessing the first did in an attempt to
>     exactly match the git-merge-recursive.py scripts' behavior.

That matches my recollection.