Checked-out branches are not shown when listing branches in operations like merge, worktrees, etc.

Open AntonHub00 opened this issue 1 year ago • 0 comments

Description

Neovim version

NVIM v0.9.5 Build type: Release LuaJIT 2.1.1692716794

Operating system and version

Pop!_OS 22.04 LTS x86_64

Steps to reproduce

git init test_repo Create a test repo
cd test_repo
touch foo.txt
git add foo.txt
git commit -m "foo.txt added"
cd ..
git clone test_repo test_repo_clone --bare Clone the repo as bare
cd test_repo_clone
git worktree add master Checkout "master" in "master" directory
git worktree add -b foo foo master Create branch foo in the foo directory starting from master
git worktree add -b bar bar master Create branch bar in the bar directory starting from master. By now the branches master, foo, and bar are checked-out
cd bar
nvim Start Neovim
:Neogit Open Neogit
m Open Merge pop-up
m Select Merge action

Expected behavior

Expecting to see the branches foo and master in the selection list (using Telescope)

Actual behavior

The selection list shows empty (no branches listed)

The output of git branch --list is as follows:

* bar
+ foo
+ master

The plus ("+") sign in git branch --list refers to "Any branches checked out in linked worktrees"

The pattern variable in the parse_branches function in lua/neogit/lib/git/branch.lua is set as follows:

local pattern = include_current and "^[* ] (.+)" or "^  (.+)"

I temporarily changed it to test locally as follows:

local pattern = include_current and "^[*+ ] (.+)" or "^[+ ] (.+)"

The output in the selection list now shows foo and master branches.

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

Mar 28 '24 00:03 AntonHub00