Neogit fails to close staged diff split if commit editor is split instead of tab

[Strongleong]

Description

In this screenshot I opened commit pop-up and pressed to abort commit. Commit editor popup is successfully closed, but staged diff split popup is not.

Here is error in text format for easy copying:

Error executing vim.schedule lua callback: vim/_editor.lua:0: nvim_exec2(): Vim(buffer):E86: Buffer 11 does not exist                                                                                                                     
stack traceback:                                                                                                                                                                                                                          
        [C]: in function 'nvim_exec2'                                                                                                                                                                                                     
        vim/_editor.lua: in function 'cmd'                                                                                                                                                                                                
        ...rongleong/projects/nvim/neogit/lua/neogit/lib/buffer.lua:206: in function <...rongleong/projects/nvim/neogit/lua/neogit/lib/buffer.lua:205>  

Neovim version

NVIM v0.10.0
Build type: Release
LuaJIT 2.1.1716656478

Operating system and version

Artix open-rc edition (kernel 6.9.2-artix1-1)

Steps to reproduce

1. git init
2. echo "a" > file
3. nvim -nu minimal.lua
4. :Neogit
5. Stage "file" file
6. Open commit editor (cc)
7. Abort committing <c-c><c-k>

Expected behavior

Commit editor popup and staged diff split popup both closed without errors

Actual behavior

Commit editor popup is closed, staged diff split popup is not, errors

Minimal config

-- NOTE: See the end of this file if you are reporting an issue, etc. Ignore all the "scary" functions up top, those are
-- used for setup and other operations.
local M = {}

local base_root_path = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h") .. "/.min"
function M.root(path)
  return base_root_path .. "/" .. (path or "")
end

function M.load_plugin(plugin_name, plugin_url)
  local package_root = M.root("plugins/")
  local install_destination = package_root .. plugin_name
  vim.opt.runtimepath:append(install_destination)

  if not vim.loop.fs_stat(package_root) then
    vim.fn.mkdir(package_root, "p")
  end

  if not vim.loop.fs_stat(install_destination) then
    print(string.format("> Downloading plugin '%s' to '%s'", plugin_name, install_destination))
    vim.fn.system({
      "git",
      "clone",
      "--depth=1",
      plugin_url,
      install_destination,
    })
    if vim.v.shell_error > 0 then
      error(string.format("> Failed to clone plugin: '%s' in '%s'!", plugin_name, install_destination),
        vim.log.levels.ERROR)
    end
  end
end

---@alias PluginName string The plugin name, will be used as part of the git clone destination
---@alias PluginUrl string The git url at which a plugin is located, can be a path. See https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols for details
---@alias MinPlugins table<PluginName, PluginUrl>

---Do the initial setup. Downloads plugins, ensures the minimal init does not pollute the filesystem by keeping
---everything self contained to the CWD of the minimal init file. Run prior to running tests, reproducing issues, etc.
---@param plugins? table<PluginName, PluginUrl>
function M.setup(plugins)
  vim.opt.packpath = {}                      -- Empty the package path so we use only the plugins specified
  vim.opt.runtimepath:append(M.root(".min")) -- Ensure the runtime detects the root min dir

  -- Install required plugins
  if plugins ~= nil then
    for plugin_name, plugin_url in pairs(plugins) do
      M.load_plugin(plugin_name, plugin_url)
    end
  end

  vim.env.XDG_CONFIG_HOME = M.root("xdg/config")
  vim.env.XDG_DATA_HOME = M.root("xdg/data")
  vim.env.XDG_STATE_HOME = M.root("xdg/state")
  vim.env.XDG_CACHE_HOME = M.root("xdg/cache")

  -- NOTE: Cleanup the xdg cache on exit so new runs of the minimal init doesn't share any previous state, e.g. shada
  vim.api.nvim_create_autocmd("VimLeave", {
    callback = function()
      vim.fn.system({
        "rm",
        "-r",
        "-f",
        M.root("xdg")
      })
    end
  })
end

-- NOTE: If you have additional plugins you need to install to reproduce your issue, include them in the plugins
-- table within the setup call below.
M.setup({
  plenary = "https://github.com/nvim-lua/plenary.nvim.git",
  telescope = "https://github.com/nvim-telescope/telescope.nvim",
  diffview = "https://github.com/sindrets/diffview.nvim",
  neogit = "https://github.com/NeogitOrg/neogit"
})
-- WARN: Do all plugin setup, test runs, reproductions, etc. AFTER calling setup with a list of plugins!
-- Basically, do all that stuff AFTER this line.
require("neogit").setup({
   commit_editor = {
    kind = "split",
  }
})

[Strongleong]

Also similar error occurs if instead of aborting commit move cursor to status buffer and close it (q). But this time neogit is fully closed (but it still spits out error)

Error executing vim.schedule lua callback: vim/_editor.lua:0: nvim_exec2(): Vim(buffer):E86: Buffer 1 does not exist                                                                                                                
stack traceback:                                                                                                                                                                                                                          
        [C]: in function 'nvim_exec2'                                                                                                                                                                                                     
        vim/_editor.lua: in function 'cmd'                                                                                                                                                                                                
        ...rongleong/projects/nvim/neogit/lua/neogit/lib/buffer.lua:206: in function <...rongleong/projects/nvim/neogit/lua/neogit/lib/buffer.lua:205>

[Felipe Lema]

duplicate of #1347

[Cameron]

Thanks for your patience - I merged a fix to this last night. Feel free to reopen if thats not the case.