RepoMirrors
/
vim-airline
mirror of https://github.com/vim-airline/vim-airline
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1334 from chrisbra/worktrees 

Add Worktrees support
This commit is contained in:
Christian Brabandt 2016-12-06 21:17:51 +01:00 committed by GitHub
parent 04be981de9 b67509189b
commit 4c39344cc1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/airline/extensions/branch.vim
View File

@ -341,7 +341,7 @@ function! airline#extensions#branch#get_head()
endfunction endfunction
function! s:check_in_path() function! s:check_in_path()
if !exists('b:airline_branch_path') if !exists('b:airline_file_in_root')
let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', '')) let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
let bufferpath = resolve(fnamemodify(expand('%'), ':p')) let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
@ -351,7 +351,13 @@ function! s:check_in_path()
let root = expand(fnamemodify(root, ':h')) let root = expand(fnamemodify(root, ':h'))
else else
" else it's the newer format, and we need to guesstimate " else it's the newer format, and we need to guesstimate
let pattern = '\.git\(\\\|\/\)modules\(\\\|\/\)' " 1) check for worktrees
if match(root, 'worktrees') > -1
" worktree can be anywhere, so simply assume true here
return 1
endif
" 2) check for submodules
let pattern = '\.git[\\/]\(modules\)[\\/]'
if match(root, pattern) >= 0 if match(root, pattern) >= 0
let root = substitute(root, pattern, '', '') let root = substitute(root, pattern, '', '')
endif endif