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

2019-08-19 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. M

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

2019-08-17 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 ---