Skip to content

Gutter diff adapts to git's core.autocrlf setting #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiguelRoldao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Gutter diff adapts to git's core.autocrlf setting #3909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion runtime/plugins/diff/diff.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ function onBufferOpen(buf)
local _, err = os.Stat(buf.AbsPath)
if err == nil then
local dirName, fileName = filepath.Split(buf.AbsPath)
local diffBase, err = shell.ExecCommand("git", "-C", dirName, "show", "HEAD:./" .. fileName)

local autocrlf, err = shell.ExecCommand("git", "-C", dirName, "config", "get", "core.autocrlf")

local diffBase
if not err and string.match(autocrlf, "true") then
diffBase, err = shell.ExecCommand("git", "-C", dirName, "cat-file", "--filters", "HEAD:./" .. fileName)
else
diffBase, err = shell.ExecCommand("git", "-C", dirName, "show", "HEAD:./" .. fileName)
end

Comment on lines -13 to +22
Copy link
Contributor

@Neko-Box-Coder Neko-Box-Coder Dec 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just use

diffBase, err = shell.ExecCommand("git", "-C", dirName, "cat-file", "--filters", "HEAD:./" .. fileName)

regardless of autocrlf?

if err ~= nil then
diffBase = buf:Bytes()
end
Expand Down