vim/vim-airline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #410 from coven/master

Browse Source 
Branch extension bugs. Fix #444
This commit is contained in:
Evgeni Kolev 2014-03-01 08:39:05 +02:00
commit 7857cc2345
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/airline/extensions.vim
View File

@ -168,7 +168,8 @@ function! airline#extensions#load()
endif endif
if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1)) if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1))
\ && (exists('*fugitive#head') || exists('*lawrencium#statusline')) \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
\ (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
call airline#extensions#branch#init(s:ext) call airline#extensions#branch#init(s:ext)
endif endif

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

@ -55,7 +55,7 @@ endfunction
function! s:check_in_path() function! s:check_in_path()
if !exists('b:airline_branch_path') if !exists('b:airline_branch_path')
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:h')) let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
if !filereadable(root) "not a file if !filereadable(root) "not a file
" if .git is a directory, it's the old submodule format " if .git is a directory, it's the old submodule format