Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Neogit screen does not populate during rebase #1656

Open
KnBrckr opened this issue Feb 13, 2025 · 0 comments
Open

Neogit screen does not populate during rebase #1656

KnBrckr opened this issue Feb 13, 2025 · 0 comments
Labels
bug Something isn't working

Comments

@KnBrckr
Copy link

KnBrckr commented Feb 13, 2025

Description

In the middle of an interactive rebase using "break" action to do some additional work.

Neogit presents mostly empty window with no commit, staged or unstaged content reported:

:messages shows the following

...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...cal/share/nvim/lazy/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to index local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:45: in function 'cb'
^I...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:361: in function <...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:315>
...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...cal/share/nvim/lazy/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to index local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:45: in function 'cb'
^I...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:361: in function <...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:315> function: builtin#18 ...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...cal/share/nvim/lazy/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to i
ndex local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:45: in function 'cb'
^I...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:361: in function <...ker/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:315>

Neovim version

NVIM v0.10.4
Build type: Release
LuaJIT 2.1.1713484068

Operating system and version

WSL AlmaLinux release 9.3 (Shamrock Pampas Cat)

Steps to reproduce

  1. git rebase -i some-target
  2. In the list of commits add a "break" action between a couple picks
  3. Update a file
  4. :Neogit

Expected behavior

A properly populated Neogit window

Actual behavior

:Neogit displays as

 [No Name]  NeogitStatus                                                                                                                                                                                                                                                                                                                                  X
  Hint: <tab> toggle | s stage | u unstage | x discard | c commit | ? help

v Head:     0000000  (no commits)

:messages contains:

> Downloading plugin 'telescope' to '/home/xxx/src/oss/.min/plugins/telescope'
> Downloading plugin 'neogit' to '/home/xxx/src/oss/.min/plugins/neogit'
> Downloading plugin 'plenary' to '/home/xxx/src/oss/.min/plugins/plenary'
> Downloading plugin 'diffview' to '/home/xxx/src/oss/.min/plugins/diffview'
...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...rc/oss/.min/plugins/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to index local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:45: in function 'cb'
^I...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:361: in function <...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:315>
...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...rc/oss/.min/plugins/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to index local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:45: in function 'cb'
^I...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:361: in function <...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:315> function: builtin#18 ...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: The coroutine failed with this message: ...rc/oss/.min/plugins/neogit/lua/neogit/lib/git/rebase.lua:231: attempt to i
ndex local 'oid' (a nil value)
stack traceback:
^I[C]: in function 'error'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:18: in function 'callback_or_next'
^I...src/oss/.min/plugins/plenary/lua/plenary/async/async.lua:45: in function 'cb'
^I...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:361: in function <...xxx/src/oss/.min/plugins/neogit/lua/neogit/process.lua:315>

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({}) -- For instance, setup Neogit
@KnBrckr KnBrckr added the bug Something isn't working label Feb 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant