Neogit staging leaves unstaged diff (Windows)

[adrianstaniec]

Description

When I stage singe lines or hunks,
the diff stays visible in Unstaged changes,
Only when I stage the whole file then it correctly disapears from Unstanged changes.
It's most probably related to windows line endings.

Neovim version

NVIM v0.11.5
Build type: Release
LuaJIT 2.1.1741730670
Run "nvim -V1 -v" for more info

Operating system and version

Windows 11

Steps to reproduce

neogit_bad_3_small_cropped.mp4

Expected behavior

See magit in the video above

Actual behavior

See video above

Minimal config

-- not really relevant I think

MiniDeps.later(function()
  MiniDeps.add({
    source = "NeogitOrg/neogit",
    depends = { "nvim-lua/plenary.nvim" },
  })
end)

[adrianstaniec]

It also works correctly in vim-fugitive but the way:

[CKolkey]

(neogit left, magit right).

I suspect you're right about it being a windows thing. On macos neogit/magit have the same behaviour. Windows related stuff is tricky for me to deal with, since I don't have access to a windows machine.

If your theory is right, I would expect changing these to "\r\n" to do something:

neogit/lua/neogit/lib/git/index.lua

Lines 67 to 69 in d93d781

	table.insert(diff_content, "\n")
	return table.concat(diff_content, "\n")

Would you mind testing that out?

[CKolkey]

#1864 you could try this branch :)

[adrianstaniec]

Yes, I am glad to test it.
I have tried the branch and it is better! so now the example from the first video works :)
And I was ready to switch to neogit ,
but then I have tried it on another repo (vim dotfiles) and there is still some diff lingering for some reason:
Please see following:

neogit_video_clip.mp4

I checked again and fugutive and magit handle it correctly

[CKolkey]

Well, if it's an improvement, I'll merge that branch. TBH I'm not sure exactly what I'm looking at with that next example. Could you try to make a more simple reproduction?

[adrianstaniec]

I am just rying to stage a hunk, and it gets staged, but still a small diff remanins showing in the "Unstaged changes" section:

but there is no visible difference between these lines, so I guess it must be some whitespace like CRLF

[CKolkey]

I wonder if the file only has a \n - not \r\n?

[adrianstaniec]

yes, indeed in this case it's just \ns, without \rs
how did you guess it? :)

[CKolkey]

Lucky guess ;D

911b106 should hopefully fix things for both unix and dos formatted files. Feel free to reopen this if that's not the case.