tyler.durden/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2025-07-25 23:14:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

branch: simplify git branch logic slightly

Browse Source
This commit is contained in:
Tim Pope 2022-07-12 21:45:05 +02:00 committed by Christian Brabandt
parent 91b67e3ca2
commit e4f586b76b
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,6 @@ function! s:config_gina_branch() abort
endfunction endfunction
function! s:display_git_branch() function! s:display_git_branch()
" disable FocusGained autocommand, might cause loops because system() causes
" a refresh, which causes a system() command again #2029
call airline#util#ignore_next_focusgain()
let name = b:buffer_vcs_config['git'].branch let name = b:buffer_vcs_config['git'].branch
try try
let commit = matchstr(FugitiveParse()[0], '^\x\+') let commit = matchstr(FugitiveParse()[0], '^\x\+')
@ -129,8 +126,15 @@ function! s:display_git_branch()
if has_key(s:names, commit) if has_key(s:names, commit)
let name = get(s:names, commit)."(".name.")" let name = get(s:names, commit)."(".name.")"
elseif !empty(commit) elseif !empty(commit)
let ref = fugitive#repo().git_chomp('describe', '--all', '--exact-match', commit) if exists('*FugitiveExecute')
if ref !~ "^fatal: no tag exactly matches" let ref = FugitiveExecute(['describe', '--all', '--exact-match', commit], bufnr('')).stdout[0]
else
noautocmd let ref = fugitive#repo().git_chomp('describe', '--all', '--exact-match', commit)
if ref =~# ':'
let ref = ''
endif
endif
if !empty(ref)
let name = s:format_name(substitute(ref, '\v\C^%(heads/|remotes/|tags/)=','',''))."(".name.")" let name = s:format_name(substitute(ref, '\v\C^%(heads/|remotes/|tags/)=','',''))."(".name.")"
else else
let name = matchstr(commit, '.\{'.s:sha1size.'}')."(".name.")" let name = matchstr(commit, '.\{'.s:sha1size.'}')."(".name.")"