difftastic icon indicating copy to clipboard operation
difftastic copied to clipboard

`git diff` fails when comparing files that differ only in file mode

Open kkrrz opened this issue 1 year ago • 3 comments

The steps to reproduce are as follows.

$ git config diff.external difft
$ touch foo bar
$ chmod 755 foo
$ git diff --no-ext-diff --no-index foo bar
diff --git foo bar
old mode 100755
new mode 100644
$ git diff --no-index foo bar
Segmentation fault: 11
$ difft --version
Difftastic 0.53.1

Tested on macOS 13.6.3

kkrrz avatar Jan 02 '24 03:01 kkrrz

Thanks for the report. I think this might be a git issue: I can also replicate if the external diff is diff or cat.

Wilfred avatar Jan 02 '24 16:01 Wilfred

I've reported upstream, the thread should soon appear in https://lore.kernel.org/git/ I think.

Wilfred avatar Jan 28 '24 20:01 Wilfred

https://lore.kernel.org/git/CAFXAjY7XcL1APhLRXU8TO96z=f7957f2ieK56dHVsXUay55vpg@mail.gmail.com/T/#u

Wilfred avatar Jan 28 '24 20:01 Wilfred

Fixed upstream, thanks for the report!

Wilfred avatar Feb 29 '24 07:02 Wilfred