Conflict with gitsigns.nvim when staging a hunk about vim-fugitive HOT 3 CLOSED

The reason the highlighting is getting screwed up is because the option diff is being set in the status window, causing all 3 to be diffed. When I check verbose set diff? in the status window after the fact I see this:

  diff                                                                                                                                                                                
        Last set from Lua

So what is happening is that you're invoking stage_hunk from gitsigns.nvim, which is written in Lua, and then some Lua code is setting an option that screws up the highlighting.

Fugitive has no Lua code. Meanwhile, have a look at this Lua code from gitsigns.nvim:

  for _, w in ipairs(api.nvim_list_wins()) do
    if api.nvim_win_is_valid(w) then
      local b = api.nvim_win_get_buf(w)
      local bname = api.nvim_buf_get_name(b)
      if bname == bufname or vim.startswith(bname, 'fugitive://') then
        if should_reload(b) then
          api.nvim_buf_call(b, function()
            vim.cmd.doautocmd('BufReadCmd')
            vim.cmd.diffthis()
          end)
        end
      end
    end

Note in particular the check for vim.startswith(bname, 'fugitive://') (which matches the status window) and the invocation of vim.cmd.diffthis() (which turns on the diff option).

This is very straightforwardly 100% a Gitsigns issue.

from vim-fugitive.

You might find vim.fn.FugitiveParse(bname) helpful. Try :echo FugitiveParse(bufname()) in each of the fugitive:// buffers to see how it works.

from vim-fugitive.

Thanks for pointing me in the right direction!
I'll try to fix it and send a PR to gitsigns

from vim-fugitive.