On 07/30, Junio C Hamano wrote: > Thomas Gummerer <t.gummerer@xxxxxxxxx> writes: > > > We currently return the exact number of conflict hunks a certain path > > has from the 'handle_paths' function. However all of its callers only > > care whether there are conflicts or not or if there is an error. > > Return only that information, and document that only that information > > is returned. This will simplify the code in the subsequent steps. > > > > Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx> > > --- > > rerere.c | 23 ++++++++++++----------- > > 1 file changed, 12 insertions(+), 11 deletions(-) > > I do recall writing this code without knowing if the actual number > of conflicts would be useful by callers, but it is apparent that it > wasn't. I won't mind losing that bit of info at all. Besides, we > won't risk mistaking a file with 2 billion conflicts with a file > whose conflicts cannot be parsed ;-). Hah, I would love to see someone actually achieve that ;) > The patch looks good. Thanks.
