[mini.diff] compare with staged version?

[hosewiejacke]

Currently, mini.diff compares files with their committed version.

Is it possible to compare files with their staged version?

Background:
Sometimes I skim over the changes (]h) and stage everything I'd like to commit (gh). As of now, there is no indication in the sign column, whether a hunk is staged or not. Would it be possible to have different signs or colors for modified/staged hunks?

Btw: thanks for mini.diff. I switched to it from gitsigns :-)

[echasnovski]

I think there is some misunderstanding here.

'mini.diff' has a more general model than working only with Git: it has buffer (i.e. current) text and reference text. Two of them are compared with each other whenever each of them changes. How reference text is computed depends on the buffer source. You can read more here.

The default source compares buffer's text with the text in the Git index, i.e. the text in the Git staging area, i.e. staged version of the file. Here are a bit more details.

Sometimes I skim over the changes (]h) and stage everything I'd like to commit (gh). As of now, there is no indication in the sign column, whether a hunk is staged or not. Would it be possible to have different signs or colors for modified/staged hunks?

Staging hunk means adding it to the index. This means that the text version in the buffer and in the reference text are the same. As there is no difference, there is no diff hunk to act (show, navigate, etc.) upon. Hence nothing is shown (in sign/number column, in overlay, etc.)

---

Does this clarify things about how 'mini.diff' works?

[hosewiejacke]

Thanks a lot! Yes, it did :-)

After some more investigation this seems to be a UI glitch in my environment. E.g. after applying a hunk (via gh) the UI isn't updated:

I first need to reload the file with :e to see the applied hunk:

[echasnovski]

After some more investigation this seems to be a UI glitch in my environment. E.g. after applying a hunk (via gh) the UI isn't updated:

This should not happen. Here is how it works for me locally (with 'signcolumn=auto'):

minidiff_add-with-signcolumn.mp4

What Neovim version and OS are you using? And just to be sure, did you disable 'gitsigns.nvim' (so that it doesn't run in parallel with 'mini.diff')?

[hosewiejacke]

Thx, I really appreciate you taking the time to look at this.

• yes, I disabled gitsigns.nvim
• signcolumn=auto, too
• Neovim version: v0.10.1 (LuaJIT 2.1.1713484068)
• OS: OpenBSD 7.6, amd64

To be honest, Gitsigns has the same problem (not updating the UI after applying a hunk). The problem there is luv:
https://github.com/lewis6991/gitsigns.nvim/blob/main/lua/gitsigns/watcher.lua#L146-L152

Maybe this is OpenBSD related. I don't want to bother you with stuff you're not using....

[echasnovski]

Yeah, it might be the same reason. Staging hunk in gen_source.git() indeed relies on directory/file watching to update the reference text. Sorry I can't help any further here.