PlexSheep
/
neovim-confs
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

plugins/configs/statusline: Fix branch seperator

This commit is contained in:
Akianonymus 2021-08-27 13:40:20 +05:30 committed by siduck76
parent cdf9250636
commit d90747415f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/plugins/configs/statusline.lua
View File

@ -227,6 +227,8 @@ components.right.active[2] = {
if gs_dict then if gs_dict then
git_branch = (gs_dict.head and #gs_dict.head > 0 and gs_dict.head) or git_branch git_branch = (gs_dict.head and #gs_dict.head > 0 and gs_dict.head) or git_branch
else else
-- path seperator
local branch_sep = package.config:sub(1, 1)
-- get file dir so we can search from that dir -- get file dir so we can search from that dir
local file_dir = vim.fn.expand "%:p:h" .. ";" local file_dir = vim.fn.expand "%:p:h" .. ";"
-- find .git/ folder genaral case -- find .git/ folder genaral case
@ -245,13 +247,12 @@ components.right.active[2] = {
git_dir = git_dir:match "gitdir: (.+)$" git_dir = git_dir:match "gitdir: (.+)$"
file:close() file:close()
-- submodule / relative file path -- submodule / relative file path
if git_dir:sub(1, 1) ~= Branch.sep and not git_dir:match "^%a:.*$" then if git_dir:sub(1, 1) ~= branch_sep and not git_dir:match "^%a:.*$" then
git_dir = git_file:match "(.*).git" .. git_dir git_dir = git_file:match "(.*).git" .. git_dir
end end
end end
if #git_dir > 0 then if #git_dir > 0 then
branch_sep = package.config:sub(1, 1)
local head_file = git_dir .. branch_sep .. "HEAD" local head_file = git_dir .. branch_sep .. "HEAD"
local f_head = io.open(head_file) local f_head = io.open(head_file)
if f_head then if f_head then