NeogitOrg / NeogitOrg/neogit

Branches checked out in a linked worktree are excluded from branch pickers (diff, checkout, etc.)

Open Beginner friendly
#2,003 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

bug
Dominant language
Lua
Stars
5.6k
Forks
357
Avg merge
15h 47m
Merged PRs (30d)
2

Description

Description
Description

parse_branches in lua/neogit/lib/git/branch.lua drops any branch that's currently checked out in another linked worktree of the same repo.

git branch prefixes such a line with + (not * for the current branch, not a space for others):

+ task/56-level-entity-admin-screen
+ epic/52-levels-entity
 feature/reports-admin-only-flag
* main

But the matching pattern only accounts for * or a space:

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

Neither branch matches a +-prefixed line, so it's silently excluded, regardless of include_current.

This affects every caller of get_local_branches/get_all_branches, e.g. the Diff popup's branch-range picker (popups/diff/actions.lua), so any branch checked out in a worktree is invisible there.

Fix

pattern should also match the + marker:

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

Alternatively we could replace get_local_branches/get_remote_branches with for-each-ref --format=%(refname) filtered by refs/heads//refs/remotes/, matching the pattern
refs.lua already established

Environment
  • Neogit: a0847c4b (v3.0.0-206-ga0847c4b)
  • Neovim: (fill in nvim --version)
  • OS: macOS (darwin 25.5.0)
Neovim version

NVIM v0.12.4
Build type: Release
LuaJIT 2.1.1785763465

Operating system and version

macOS (darwin 25.5.0)

Steps to reproduce
  1. Create a linked worktree on a branch: git worktree add ../wt some-branch
  2. Open Neogit, invoke the diff popup's branch picker (d → range, or similar).
  3. some-branch is missing from the list, even though git branch lists it (with a + marker).
Expected behavior

All local branches appear in the picker, including ones checked out in other worktrees.

Actual behavior

some-branch is missing from the list, even though git branch lists it (with a + marker).

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

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start in lua/neogit/lib/git/branch.lua at parse_branches and inspect its callers, including popups/diff/actions.lua. Reproduce with a linked worktree, then verify that branches marked with + appear in the diff branch-range picker and other branch pickers while existing current-branch behavior remains unchanged.

Written by the indexing model from the issue text.

Assessment

Tech stack
git, lua, neovim
Domain
cli, tooling
Issue type
Bug
Difficulty
2/5
Estimated time
1-3 hours
Activity status
Quiet
Clarity
Clearly specified
Newbie friendliness
75/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.