Re: [PATCH 06/19] Change call signature of write_tree_from_memory()

2019-07-25 Thread Elijah Newren
Hi Dscho, On Thu, Jul 25, 2019 at 12:55 PM Johannes Schindelin wrote: > > Hi Elijah, > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > diff --git a/merge-recursive.c b/merge-recursive.c > > index 7f56cb0ed1..1a3c6ab7f3 100644 > > --- a/merge-recursive.c > > +++ b/merge-recursive.c > > [...] > >

Re: [PATCH 06/19] Change call signature of write_tree_from_memory()

2019-07-25 Thread Johannes Schindelin
Hi Elijah, On Thu, 25 Jul 2019, Elijah Newren wrote: > diff --git a/merge-recursive.c b/merge-recursive.c > index 7f56cb0ed1..1a3c6ab7f3 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > [...] > @@ -434,11 +434,10 @@ struct tree *write_tree_from_memory(struct > merge_options *opt) > >

[PATCH 06/19] Change call signature of write_tree_from_memory()

2019-07-25 Thread Elijah Newren
write_tree_from_memory() is more of a cache-tree thing than a merge-recursive thing (especially since it is called from checkout.c in a context before doing anything with merging), but in particular there is no need for it to take a merge_options struct when it only really needs a repository struct