Re: [PATCH v3 21/24] merge-recursive: split internal fields into a separate struct

2019-08-16 Thread Elijah Newren
On Fri, Aug 16, 2019 at 2:19 PM SZEDER Gábor wrote: > > On Thu, Aug 15, 2019 at 02:40:50PM -0700, Elijah Newren wrote: > > diff --git a/merge-recursive.c b/merge-recursive.c > > > static void merge_finalize(struct merge_options *opt) > > { > > flush_output(opt); > > - if (!opt->call_de

Re: [PATCH v3 21/24] merge-recursive: split internal fields into a separate struct

2019-08-16 Thread Junio C Hamano
Elijah Newren writes: > 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. >

Re: [PATCH v3 21/24] merge-recursive: split internal fields into a separate struct

2019-08-16 Thread SZEDER Gábor
On Thu, Aug 15, 2019 at 02:40:50PM -0700, Elijah Newren wrote: > diff --git a/merge-recursive.c b/merge-recursive.c > static void merge_finalize(struct merge_options *opt) > { > flush_output(opt); > - if (!opt->call_depth && opt->buffer_output < 2) > + if (!opt->priv->call_depth &&

[PATCH v3 21/24] merge-recursive: split internal fields into a separate struct

2019-08-15 Thread Elijah Newren
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 ---