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 #1299 from gregorias/fix_git_untracked 

Display not exists symbol correctly in Git repos
This commit is contained in:
Christian Brabandt 2016-10-26 20:47:28 +02:00 committed by GitHub
parent 5fe511c20b 2af2bdb424
commit 98fe4eabd4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ function! s:get_git_untracked(file)
else
let output = system(s:git_cmd. shellescape(a:file))
let untracked = ''
if output[0:1] is# '??' && output[3:-2] is? a:file
if output[0:1] is# '??'
let untracked = get(g:, 'airline#extensions#branch#notexists', g:airline_symbols.notexists)
endif
let s:untracked_git[a:file] = untracked
@ -174,18 +174,24 @@ function! airline#extensions#branch#head()
let l:hg_head = s:get_hg_branch()
let l:file = expand("%:p")
" Do not get untracked flag if we are modifying a directory.
let l:is_file_and_not_dir = !isdirectory(l:file)
if !empty(l:git_head)
let found_fugitive_head = 1
let l:heads.git = (!empty(l:hg_head) ? "git:" : '') . s:format_name(l:git_head)
if l:is_file_and_not_dir
call s:get_git_untracked(l:file)
let l:heads.git .= get(s:untracked_git, l:file, '')
endif
endif
if !empty(l:hg_head)
let l:heads.mercurial = (!empty(l:git_head) ? "hg:" : '') . s:format_name(l:hg_head)
if l:is_file_and_not_dir
call s:get_hg_untracked(l:file)
let l:heads.mercurial.= get(s:untracked_hg, l:file, '')
endif
endif
if empty(l:heads)
if s:has_vcscommand