From 66e49d9a15b02241ec74e648d4deb5378c03225f Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Wed, 27 Jun 2018 18:03:34 -0400 Subject: [PATCH 1/2] Fix fugitiveline when file is also branch name --- autoload/airline/extensions/fugitiveline.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/airline/extensions/fugitiveline.vim b/autoload/airline/extensions/fugitiveline.vim index 744b903f..e1618171 100644 --- a/autoload/airline/extensions/fugitiveline.vim +++ b/autoload/airline/extensions/fugitiveline.vim @@ -20,7 +20,7 @@ function! airline#extensions#fugitiveline#bufname() try let buffer = fugitive#buffer() if buffer.type('blob') - let b:fugitive_name = buffer.repo().translate(buffer.path()) + let b:fugitive_name = buffer.repo().translate(buffer.path('/')) endif catch endtry From 9bee0e923e90bbc264b040ec08e21e9f02d8e3d7 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Wed, 27 Jun 2018 18:07:59 -0400 Subject: [PATCH 2/2] Use FugitivePath in fugitiveline if available --- autoload/airline/extensions/fugitiveline.vim | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/autoload/airline/extensions/fugitiveline.vim b/autoload/airline/extensions/fugitiveline.vim index e1618171..4b722184 100644 --- a/autoload/airline/extensions/fugitiveline.vim +++ b/autoload/airline/extensions/fugitiveline.vim @@ -18,9 +18,13 @@ function! airline#extensions#fugitiveline#bufname() if !exists('b:fugitive_name') let b:fugitive_name = '' try - let buffer = fugitive#buffer() - if buffer.type('blob') - let b:fugitive_name = buffer.repo().translate(buffer.path('/')) + if bufname('%') =~? '^fugitive:' && exists('*FugitivePath') + let b:fugitive_name = FugitivePath() + elseif exists('b:git_dir') + let buffer = fugitive#buffer() + if buffer.type('blob') + let b:fugitive_name = buffer.repo().translate(buffer.path('/')) + endif endif catch endtry