On Wed, Aug 29, 2018 at 7:54 PM Jeff King <peff@xxxxxxxx> wrote: > > On Wed, Aug 29, 2018 at 10:10:25PM -0400, Gabriel Holodak wrote: > > > > Could you cut down to a real minimal reproduction, i.e. just these 20 > > > lines or so? > > > > I'm working on getting down to a minimal reproduction, a few lines at > > a time. One thing that seems strange: as I've removed lines, there are > > a bunch of lines that don't matter. Then I'll find some lines that, if > > removed, completely fix the issue. But the ordering for these > > apparently important lines doesn't matter. They just have to be > > somewhere in the file to cause the duplicated diffs. > > > > I'll upload again when I've figured out all the unimportant lines to remove. > > Yeah, I reproduced based on your initial post, but noticed that when I > cut it down the problem went away. Oh, I had to look further down than I did initially. Now I can reproduce it from the initial data as well. Note that it goes away with --minimal. I have a patch cooking (which was sent out as https://public-inbox.org/git/20180810221857.87399-1-sbeller@xxxxxxxxxx/) and one of the weaknesses in that patch is the lack of explanation on when the heuristic is applied as I have not fully understood it yet.