squidy/vimrc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated plugins

Browse Source
This commit is contained in:
amix
2014-09-27 16:32:18 +01:00
parent 2a9908e4f0
commit 89c36a0d2c
97 changed files with 3635 additions and 1655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
View File

@@ -21,7 +21,12 @@ function! s:get_git_branch(path)
else
try
let line = join(readfile(dir . '/HEAD'))
let name = strpart(line, 16)
if strpart(line, 0, 16) == 'ref: refs/heads/'
let name = strpart(line, 16)
else
" raw commit hash
let name = strpart(line, 0, 7)
endif
catch
let name = ''
endtry
@@ -37,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()
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"))
@@ -61,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