From 01050c9569d632cda529f1e5c1f8eb5094117199 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Tue, 25 Dec 2018 16:35:00 -0500 Subject: [PATCH] Fix :Gstatus error on branch without pull source --- autoload/fugitive.vim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index f9d7ed5..eca6893 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -1468,6 +1468,7 @@ function! fugitive#BufReadStatus() abort let config = fugitive#Config() + let pull_type = 'Pull' if len(pull) let rebase = fugitive#Config('branch.' . branch . '.rebase', config) if empty(rebase) @@ -1477,8 +1478,6 @@ function! fugitive#BufReadStatus() abort let pull_type = 'Rebase' elseif rebase =~# '^\%(false\|no|off\|0\|\)$' let pull_type = 'Merge' - else - let pull_type = 'Upstream' endif endif