m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-13 22:03:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix :Gstatus error on branch without pull source

Browse Source
This commit is contained in:
Tim Pope
2018-12-25 16:35:00 -05:00
parent d3468dd09b
commit 01050c9569
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/fugitive.vim
View File

@@ -1468,6 +1468,7 @@ function! fugitive#BufReadStatus() abort
let config = fugitive#Config() let config = fugitive#Config()
let pull_type = 'Pull'
if len(pull) if len(pull)
let rebase = fugitive#Config('branch.' . branch . '.rebase', config) let rebase = fugitive#Config('branch.' . branch . '.rebase', config)
if empty(rebase) if empty(rebase)
@@ -1477,8 +1478,6 @@ function! fugitive#BufReadStatus() abort
let pull_type = 'Rebase' let pull_type = 'Rebase'
elseif rebase =~# '^\%(false\|no|off\|0\|\)$' elseif rebase =~# '^\%(false\|no|off\|0\|\)$'
let pull_type = 'Merge' let pull_type = 'Merge'
else
let pull_type = 'Upstream'
endif endif
endif endif