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 #577 from qstrahl/master 

Don't wipe out b:airline_head if fugitive finds the head
This commit is contained in:
Bailey Ling 2014-08-25 20:48:18 -04:00
parent f17927053e 30df99a681
commit ad19d1a10f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,11 @@ function! airline#extensions#branch#head()
endif
let b:airline_head = ''
let found_fugitive_head = 0
if s:has_fugitive && !exists('b:mercurial_dir')
let b:airline_head = fugitive#head(7)
let found_fugitive_head = 1
if empty(b:airline_head) && !exists('b:git_dir')
let b:airline_head = s:get_git_branch(expand("%:p:h"))
@ -66,7 +68,7 @@ function! airline#extensions#branch#head()
endif
endif
if empty(b:airline_head) || !s:check_in_path()
if empty(b:airline_head) || !found_fugitive_head && !s:check_in_path()
let b:airline_head = ''
endif