staging/committing a change does not update the gitsigns column

[justinmk]

Description

bisected to: 1fcaddc

Neovim version

NVIM v0.12.0-dev-905+gd08b26511154

Operating system and version

macos

Expected behavior

After fugitive :Gwrite to stage buffer changes, gitsigns should not show signs for changed/added/deleted lines.

Actual behavior

After fugitive :Gwrite to stage buffer changes, the signs for changed/added/deleted lines are still shown, they aren't auto-updated.

Minimal config

for name, url in pairs{
  gitsigns = 'https://github.com/lewis6991/gitsigns.nvim',
  fugitive = 'https://github.com/tpope/vim-fugitive/',
} do
  local install_path = vim.fn.fnamemodify('gitsigns_issue/'..name, ':p')
  if vim.fn.isdirectory(install_path) == 0 then
    vim.fn.system { 'git', 'clone', '--depth=1', url, install_path }
  end
  vim.opt.runtimepath:append(install_path)
end

require('gitsigns').setup{
  debug_mode = true, -- You must add this to enable debug messages
}

Steps to reproduce

1. nvim --clean -u min.lua
2. delete a line in a git-tracked file
   • gitsigns shows "deleted" sign on the line.
3. :write (save the file)
4. :Gwrite (stage the changes with fugitive)
5. gitsigns still shows the deleted sign.

Gitsigns debug messages

Gitsigns cache

[loissascha]

same issue for me Linux

[lewis6991]

Unable to reproduce on macos.

Getting these debug messages:

10132.07 D attach(1): Already attached
11137.87 D watcher_cb: Git dir update: 'index' { rename = true }
11138.23 D git: git rev-parse --show-toplevel --absolute-git-dir --abbrev-ref HEAD
11169.45 D fn(1): Watcher handler called for buffer 1 /Users/lewrus01/projects/async.nvim/Makefile
11170.52 D git: git --git-dir $CWD/.git  ls-files --stage --others --exclude-standard --eol $CWD/Makefile
11188.60 D git: git --git-dir $CWD/.git show aa555e5371c1857a27d764f97396f94daad435ee
11198.44 D git: git --git-dir $CWD/.git show HEAD:Makefile

The watcher_cb message is the file change event triggering which updates the signs.

[tom-anders]

I see this issue on Ubuntu 24 as well, here's my debug log:

89493.51 D attach(1): Already attached
89504.58 D attach(1): Already attached
90499.95 D watcher_cb: Git dir update: 'index' { rename = true }
90500.06 D git: git rev-parse --show-toplevel --absolute-git-dir --abbrev-ref HEAD
90504.56 D fn(1): Watcher handler called for buffer 1 /home/tom/.dotfiles/vim/lua/plugins.lua
90504.94 D git: git --git-dir $CWD/.git  ls-files --stage --others --exclude-standard --eol $CWD/vim/lua/plugins.lua
90514.37 D git: git --git-dir $CWD/.git show 40ecd68509cdf7015a56d6be151c6abdc21d0bf8
90530.27 D git: git --git-dir $CWD/.git show HEAD:vim/lua/plugins.lua

[tom-anders]

I see this issue on Ubuntu 24 as well, here's my debug log:

89493.51 D attach(1): Already attached
89504.58 D attach(1): Already attached
90499.95 D watcher_cb: Git dir update: 'index' { rename = true }
90500.06 D git: git rev-parse --show-toplevel --absolute-git-dir --abbrev-ref HEAD
90504.56 D fn(1): Watcher handler called for buffer 1 /home/tom/.dotfiles/vim/lua/plugins.lua
90504.94 D git: git --git-dir $CWD/.git  ls-files --stage --others --exclude-standard --eol $CWD/vim/lua/plugins.lua
90514.37 D git: git --git-dir $CWD/.git show 40ecd68509cdf7015a56d6be151c6abdc21d0bf8
90530.27 D git: git --git-dir $CWD/.git show HEAD:vim/lua/plugins.lua

Hmm, it seems that the issue only occurs sporadically, so in that log above it might not actually have occured, I'm not sure

[lewis6991]

I've merged #1385 which may fix the issue but is just a guess.

[tom-anders]

Here's a log where the issue definitely did occur (I haven't updated to #1385 yet)

330857.84 D parse_git_path: Fugitive buffer for file 'nil' from path 'fugitive:///home/tom/src/foo/.git/worktrees/bar/' on commit 'nil'
330892.20 D attach(6): Cannot resolve file in repo

[kevinstadler]

I have the same issue (sign column not updating even though stage_hunk succeeded, and I can see the updated index in fugitive) on Ubuntu 24.04 running WSL, when the git repository is on the Windows host filesystem (i.e. I am accessing the mount under /mnt/c/).

The behavior is unchanged after the merge of #1385.

Curiously, the index is also not updated when I run a gitsigns command that operates in a new buffer, e.g. when I call diffthis after staging a hunk, it shows me a diff where the hunk isn't staged yet.

[lewis6991]

Gitsigns is getting into a locked state (something isn't releasing the lock). Just need to know how to reproduce.

[justinmk]

I will share logs when I have time later.

[lewis6991]

I've disabled the update lock completely by default 13528de . Maybe that works? If not I can continue to remove more of the locks to narrow this down.

[tom-anders]

Looks to me like it's almost always reproducible when opening the same file in two separate neovim instanaces. One of them works, the other doesn't

[alex35mil]

Same thing on macOS. I'm on the latest version and I can reliably reproduce it.

branch main
commit 8270378

I can share logs, but I don't know where to find them.