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

Move pull_type into stat

Browse Source
This commit is contained in:
Tim Pope
2024-03-02 11:52:28 -05:00
parent 85eef8003e
commit 16ffd9623e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
autoload/fugitive.vim
View File

@@ -2881,7 +2881,6 @@ function! fugitive#BufReadStatus(cmdbang) abort
let push_remote = '' let push_remote = ''
endif endif
let pull_type = 'Pull'
if empty(fetch_remote) || empty(branch) if empty(fetch_remote) || empty(branch)
let pull_ref = '' let pull_ref = ''
elseif fetch_remote ==# '.' elseif fetch_remote ==# '.'
@@ -2889,15 +2888,17 @@ function! fugitive#BufReadStatus(cmdbang) abort
else else
let pull_ref = substitute(config.Get('branch.' . branch . '.merge', ''), '^refs/heads/', 'refs/remotes/' . fetch_remote . '/', '') let pull_ref = substitute(config.Get('branch.' . branch . '.merge', ''), '^refs/heads/', 'refs/remotes/' . fetch_remote . '/', '')
endif endif
let stat.pull_type = 'Pull'
if len(pull_ref) if len(pull_ref)
let rebase = FugitiveConfigGet('branch.' . branch . '.rebase', config) let rebase = FugitiveConfigGet('branch.' . branch . '.rebase', config)
if empty(rebase) if empty(rebase)
let rebase = FugitiveConfigGet('pull.rebase', config) let rebase = FugitiveConfigGet('pull.rebase', config)
endif endif
if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$' if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$'
let pull_type = 'Rebase' let stat.pull_type = 'Rebase'
elseif rebase =~# '^\%(false\|no|off\|0\|\)$' elseif rebase =~# '^\%(false\|no|off\|0\|\)$'
let pull_type = 'Merge' let stat.pull_type = 'Merge'
endif endif
endif endif
@@ -2973,7 +2974,7 @@ function! fugitive#BufReadStatus(cmdbang) abort
let stat.expanded = {'Staged': {}, 'Unstaged': {}} let stat.expanded = {'Staged': {}, 'Unstaged': {}}
let to = {'lines': []} let to = {'lines': []}
call s:AddHeader(to, 'Head', head) call s:AddHeader(to, 'Head', head)
call s:AddHeader(to, pull_type, pull_short) call s:AddHeader(to, stat.pull_type, pull_short)
if push_ref !=# pull_ref if push_ref !=# pull_ref
call s:AddHeader(to, 'Push', push_short) call s:AddHeader(to, 'Push', push_short)
endif endif