On Thu, Jun 10, 2021 at 5:54 AM Jeff King <peff@xxxxxxxx> wrote: > > This started as an attempt to silence a "gcc -O3" warning. But I was > curious if we could trigger the problem it complains about in practice > (spoiler: we can), so I wrote a test. And it seems there was an even > bigger bug lurking, where we'd generate bogus merge results. :) > > This fixes both bugs. Nice catches, and fixes. I had a minor comment on 2/2, but with or without fixing up the 'path_unused' variable name both patches are: Reviewed-by: Elijah Newren <newren@xxxxxxxxx>