Skip to content

use --git-dir to get correct branch data in get_git_detached_head #202

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.

Sign up for GitHub

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

Open
Abh15h3k wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use --git-dir to get correct branch data in get_git_detached_head #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lua/galaxyline/provider_vcs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ function M.get_git_dir(path)
return path .. '/' .. git_dir
end

local function get_git_detached_head()
local git_branches_file = io.popen("git branch -a --no-abbrev --contains", "r")
local function get_git_detached_head(git_dir)
local git_branches_cmd = "git --git-dir=" .. git_dir .. " branch -a --no-abbrev --contains"
local git_branches_file = io.popen(git_branches_cmd, "r")
if not git_branches_file then return end
local git_branches_data = git_branches_file:read("*l")
io.close(git_branches_file)
Expand Down Expand Up @@ -161,7 +162,7 @@ function M.get_git_branch()
local branch_name = head_cache[git_root].head:match("ref: refs/heads/([^\n\r%s]+)")
if not branch_name then
-- check if detached head
branch_name = get_git_detached_head()
branch_name = get_git_detached_head(git_dir)
if not branch_name then return end
end

Expand Down