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

Don't wipe out b:airline_head if fugitive finds the head 

- Fugitive can edit virtual files that represent objects in git; while
  editing these files, it still reports on the HEAD of the relevant
  repo, which should be displayed as the branch (rather than having the
  branch section disappear)
This commit is contained in:
Quinn Strahl 2014-08-15 16:07:18 -04:00
parent f17927053e
commit 30df99a681
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 endif
let b:airline_head = '' let b:airline_head = ''
let found_fugitive_head = 0
if s:has_fugitive && !exists('b:mercurial_dir') if s:has_fugitive && !exists('b:mercurial_dir')
let b:airline_head = fugitive#head(7) let b:airline_head = fugitive#head(7)
let found_fugitive_head = 1
if empty(b:airline_head) && !exists('b:git_dir') if empty(b:airline_head) && !exists('b:git_dir')
let b:airline_head = s:get_git_branch(expand("%:p:h")) let b:airline_head = s:get_git_branch(expand("%:p:h"))
@ -66,7 +68,7 @@ function! airline#extensions#branch#head()
endif endif
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 = '' let b:airline_head = ''
endif endif