Re: [PATCH 15/19] merge-recursive: split internal fields into a separate struct

Hi Dscho, On Fri, Jul 26, 2019 at 4:25 AM Johannes Schindelin wrote: > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > On Thu, Jul 25, 2019 at 1:12 PM Johannes Schindelin > > wrote: > > But, more importantly: > > * I want to write an alternative merge strategy providing drop-in > > replacem

Re: [PATCH 15/19] merge-recursive: split internal fields into a separate struct

Hi Elijah, On Thu, 25 Jul 2019, Elijah Newren wrote: > On Thu, Jul 25, 2019 at 1:12 PM Johannes Schindelin > wrote: > > > > Hi Elijah, > > > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > > > merge_options has several internal fields that should not be set or read > > > by external callers.

Re: [PATCH 15/19] merge-recursive: split internal fields into a separate struct

On Thu, Jul 25, 2019 at 1:12 PM Johannes Schindelin wrote: > > Hi Elijah, > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > merge_options has several internal fields that should not be set or read > > by external callers. This just complicates the API. Move them into an > > opaque merge_option

Re: [PATCH 15/19] merge-recursive: split internal fields into a separate struct

Hi Elijah, On Thu, 25 Jul 2019, Elijah Newren wrote: > merge_options has several internal fields that should not be set or read > by external callers. This just complicates the API. Move them into an > opaque merge_options_internal struct that is defined only in > merge-recursive.c and keep the

[PATCH 15/19] merge-recursive: split internal fields into a separate struct

merge_options has several internal fields that should not be set or read by external callers. This just complicates the API. Move them into an opaque merge_options_internal struct that is defined only in merge-recursive.c and keep these out of merge-recursive.h. Signed-off-by: Elijah Newren ---