Re: [PATCH 00/19] Cleanup merge API

2019-07-26 Thread Elijah Newren
Hi Dscho, On Thu, Jul 25, 2019 at 12:15 PM Johannes Schindelin wrote: > > Hi Elijah, > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > * All current callers (3 of them?) of merge_recursive() always pass > > it a specially created reversed-list for the merge_bases. Some > > history sp

Re: [PATCH 00/19] Cleanup merge API

2019-07-26 Thread Johannes Schindelin
Hi Junio, On Thu, 25 Jul 2019, Junio C Hamano wrote: > Elijah Newren writes: > > > On Thu, Jul 25, 2019 at 11:12 AM Junio C Hamano wrote: > > > >> > Stuff I'd most welcome review on: > >> > * Is cache-tree.c the right place for write_tree_from_memory()? > >> > [see patch 7] Should there

Re: [PATCH 00/19] Cleanup merge API

2019-07-25 Thread Junio C Hamano
Elijah Newren writes: > On Thu, Jul 25, 2019 at 11:12 AM Junio C Hamano wrote: > >> > 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(), alrea

Re: [PATCH 00/19] Cleanup merge API

2019-07-25 Thread Johannes Schindelin
Hi Elijah, On Thu, 25 Jul 2019, Elijah Newren wrote: > * All current callers (3 of them?) of merge_recursive() always pass > it a specially created reversed-list for the merge_bases. Some > history spelunking provides no details on any of these about why; > it appears that the 2nd

Re: [PATCH 00/19] Cleanup merge API

2019-07-25 Thread Elijah Newren
On Thu, Jul 25, 2019 at 11:12 AM Junio C Hamano wrote: > > 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 d

Re: [PATCH 00/19] Cleanup merge API

2019-07-25 Thread Junio C Hamano
Elijah Newren writes: > 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

[PATCH 00/19] Cleanup merge API

2019-07-25 Thread Elijah Newren
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 mi