From 1891933e591d3e80012f9186d5111994bb668b0f Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Tue, 20 Jun 2017 17:47:07 +0200 Subject: [PATCH] branch: better display of branch for both hg and git If a file is edited inside a git repository, which lies within a git repository, the branch extensions shows 'gitmaster | hgdefault' To make it more obvious, that we are looking into both repositories here, use 'git:master | hg:default' closes #1482 --- autoload/airline/extensions/branch.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index aa66457..dcaaea6 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -303,7 +303,7 @@ function! airline#extensions#branch#head() if !empty(b:airline_head) let b:airline_head .= ' | ' endif - let b:airline_head .= (len(l:heads) > 1 ? s:vcs_config[l:vcs].exe : '') . s:format_name(l:heads[l:vcs]) + let b:airline_head .= (len(l:heads) > 1 ? s:vcs_config[l:vcs].exe .':' : '') . s:format_name(l:heads[l:vcs]) let b:airline_head .= b:buffer_vcs_config[vcs].untracked endfor