Skip to content

Account for more detached head states #196

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
tmwitczak wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Account for more detached head states #196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ad5af
Accept all possible characters of detached head state
tmwitczak Jul 10, 2021
9395702
Account for head state during rebase
tmwitczak Jul 10, 2021
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
19 changes: 13 additions & 6 deletions lua/galaxyline/provider_vcs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,23 @@ function M.get_git_dir(path)
return path .. '/' .. git_dir
end

local function get_git_detached_head()
local function get_git_head_state()
local git_branches_file = io.popen("git branch -a --no-abbrev --contains", "r")
if not git_branches_file then return end
local git_branches_data = git_branches_file:read("*l")
io.close(git_branches_file)
if not git_branches_data then return end

local branch_name = git_branches_data:match('.*HEAD (detached %w+ [%w/-]+)')
if branch_name and string.len(branch_name) > 0 then
return branch_name
local patterns = {
'.*no branch, (rebasing .+)%)',
'.*HEAD (detached .+)%)'
}

for _, pattern in ipairs(patterns) do
local branch_name = git_branches_data:match(pattern)
if branch_name and string.len(branch_name) > 0 then
return branch_name
end
end
end

Expand Down Expand Up @@ -160,8 +167,8 @@ 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()
-- check if detached head or rebase in progress
branch_name = get_git_head_state()
if not branch_name then return end
end

Expand Down