Speed up git prompt filtering

This increases performance of git prompt filter by fetching branch name directly from `.git/HEAD` file instead of spawning `git` process. Apart from increasing performance this may also solve potential problems with `git` output, as reported in https://github.com/cmderdev/cmder/issues/692
This commit is contained in:
Vladimir Kotikov 2015-11-07 02:44:43 +03:00
parent 3657795b35
commit 53e03076da

View File

@ -118,17 +118,23 @@ end
--- ---
-- Find out current branch -- Find out current branch
-- @return {false|git branch name} -- @return {nil|git branch name}
--- ---
function get_git_branch() function get_git_branch(git_dir)
for line in io.popen("git branch 2>nul"):lines() do local git_dir = git_dir or get_git_dir()
local m = line:match("%* (.+)$")
if m then
return m
end
end
return false -- If git directory not found then we're probably outside of repo
-- or something went wrong. The same is when head_file is nil
local head_file = git_dir and io.open(git_dir..'/HEAD')
if not head_file then return end
local HEAD = head_file:read()
head_file:close()
-- if HEAD matches branch expression, then we're on named branch
-- otherwise it is a detached commit
local branch_name = HEAD:match('ref: refs/heads/(.+)')
return branch_name or 'HEAD detached at '..HEAD:sub(1, 7)
end end
--- ---
@ -147,9 +153,10 @@ function git_prompt_filter()
dirty = "\x1b[31;1m", dirty = "\x1b[31;1m",
} }
if get_git_dir() then local git_dir = get_git_dir()
if git_dir then
-- if we're inside of git repo then try to detect current branch -- if we're inside of git repo then try to detect current branch
local branch = get_git_branch() local branch = get_git_branch(git_dir)
if branch then if branch then
-- Has branch => therefore it is a git folder, now figure out status -- Has branch => therefore it is a git folder, now figure out status
if get_git_status() then if get_git_status() then