Re: Possible bug: identical lines added/removed in git diff

2018-09-01 Thread Stefan Beller
On Fri, Aug 31, 2018 at 2:39 PM Johannes Schindelin wrote: > > Hi, > > On Thu, 30 Aug 2018, Stefan Beller wrote: > > > On Thu, Aug 30, 2018 at 12:20 PM Jeff King wrote: > > > > > > [...] Myers does not promise to find the absolute minimal diff. [...] > > > > The `Myers` (our default) diff algorit

Re: Possible bug: identical lines added/removed in git diff

2018-08-31 Thread Johannes Schindelin
Hi, On Thu, 30 Aug 2018, Stefan Beller wrote: > On Thu, Aug 30, 2018 at 12:20 PM Jeff King wrote: > > > > [...] Myers does not promise to find the absolute minimal diff. [...] > > The `Myers` (our default) diff algorithm is really the Myers algorithm + > a heuristic that cuts off the long tail

Re: Possible bug: identical lines added/removed in git diff

2018-08-30 Thread Stefan Beller
On Thu, Aug 30, 2018 at 12:20 PM Jeff King wrote: > > On Thu, Aug 30, 2018 at 12:16:22PM -0700, Stefan Beller wrote: > > > On Wed, Aug 29, 2018 at 7:54 PM Jeff King wrote: > > > > > > On Wed, Aug 29, 2018 at 10:10:25PM -0400, Gabriel Holodak wrote: > > > > > > > > Could you cut down to a real min

Re: Possible bug: identical lines added/removed in git diff

2018-08-30 Thread Jeff King
On Thu, Aug 30, 2018 at 12:16:22PM -0700, Stefan Beller wrote: > On Wed, Aug 29, 2018 at 7:54 PM Jeff King 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? > > > >

Re: Possible bug: identical lines added/removed in git diff

2018-08-30 Thread Stefan Beller
On Wed, Aug 29, 2018 at 7:54 PM Jeff King 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

Re: Possible bug: identical lines added/removed in git diff

2018-08-29 Thread Jeff King
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, ther

Re: Possible bug: identical lines added/removed in git diff

2018-08-29 Thread Gabriel Holodak
I did have some possibly interfering settings in my .gitconfig previously. I removed everything, so all the commands I'll describe were run with an empty config. On Mon, Aug 27, 2018 at 1:47 PM Stefan Beller wrote: > I suspected you might have a different diff algorithm configured, > so I tested

Re: Possible bug: identical lines added/removed in git diff

2018-08-27 Thread Stefan Beller
On Sun, Aug 26, 2018 at 6:54 PM Gabriel Holodak wrote: > > I think I'm running into a bug with git diff on v2.18.0. I cannot reproduce with the two files attached. I suspected you might have a different diff algorithm configured, so I tested git diff --no-index old new git diff --patienc

Possible bug: identical lines added/removed in git diff

2018-08-26 Thread Gabriel Holodak
I think I'm running into a bug with git diff on v2.18.0. When I diff the attached files, part of the diff ends up looking like: ... STARTCHAR U+00F0 ENCODING 240 SWIDTH 500 0 -DWIDTH 8 0 -BBX 7 12 1 0 -BITMAP -12 -0C -14 -22 -02 -3E -42 -42 -82 -84 -84 -78 +DWIDTH 8 0 +BBX 8 12 0 0 +BITMAP +1B +