On 5/7/2020 6:27 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: >> diff --git a/unpack-trees.c b/unpack-trees.c >> index 9a3ccd9d083..4f880f2da90 100644 >> --- a/unpack-trees.c >> +++ b/unpack-trees.c >> @@ -563,10 +563,11 @@ static int warn_conflicted_path(struct index_state *istate, >> add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); >> >> /* Find out how many higher stage entries at same path */ >> - while (++count < istate->cache_nr && >> + while (i + ++count < istate->cache_nr && >> !strcmp(conflicting_path, >> istate->cache[i+count]->name)) >> /* do nothing */; > > Eek. Yes, it is obvious that the original is wrong once you point > it out. But "i + ++count" looks like a line noise, and funny way > that lines are wrapped in the original does not help X-<. > > We may want to fix the style and the grammar while we are at it, > perhaps like the attached. > > In any case, thanks for a fix. > > unpack-trees.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/unpack-trees.c b/unpack-trees.c > index 6bbf58d28e..c38938d96c 100644 > --- a/unpack-trees.c > +++ b/unpack-trees.c > @@ -562,11 +562,11 @@ static int warn_conflicted_path(struct index_state *istate, > > add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); > > - /* Find out how many higher stage entries at same path */ > - while (++count < istate->cache_nr && > - !strcmp(conflicting_path, > - istate->cache[i+count]->name)) > - /* do nothing */; > + /* Find out how many higher stage entries are at same path */ > + while ((++count) + i < istate->cache_nr && > + !strcmp(conflicting_path, istate->cache[count + i]->name)) > + ; /* do nothing */ > + This looks much better, thanks! As I mentioned in the cover letter, this is worth taking on its own. Could you queue the collaborative patch? I'll eject it from the next version of this series. Thanks, -Stolee
