mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-12 05:13:53 -05:00
Move unpushed sections above unpulled, again
This reverts commit 279d56eb47
(effectively).
References: https://github.com/tpope/vim-fugitive/issues/1963
This commit is contained in:
@@ -2845,17 +2845,17 @@ function! fugitive#BufReadStatus(...) abort
|
|||||||
call s:AddSection('Staged', staged)
|
call s:AddSection('Staged', staged)
|
||||||
let staged_end = len(staged) ? line('$') : 0
|
let staged_end = len(staged) ? line('$') : 0
|
||||||
|
|
||||||
if len(pull) && get(props, 'branch.ab') !~# ' -0$'
|
if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
|
||||||
call s:AddLogSection('Unpulled from ' . pull, head, pull)
|
call s:AddLogSection('Unpushed to ' . push, push, head)
|
||||||
endif
|
|
||||||
if len(push) && push !=# pull
|
|
||||||
call s:AddLogSection('Unpulled from ' . push, head, push)
|
|
||||||
endif
|
endif
|
||||||
if len(pull) && push !=# pull
|
if len(pull) && push !=# pull
|
||||||
call s:AddLogSection('Unpushed to ' . pull, pull, head)
|
call s:AddLogSection('Unpushed to ' . pull, pull, head)
|
||||||
endif
|
endif
|
||||||
if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
|
if len(push) && push !=# pull
|
||||||
call s:AddLogSection('Unpushed to ' . push, push, head)
|
call s:AddLogSection('Unpulled from ' . push, head, push)
|
||||||
|
endif
|
||||||
|
if len(pull) && get(props, 'branch.ab') !~# ' -0$'
|
||||||
|
call s:AddLogSection('Unpulled from ' . pull, head, pull)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
setlocal nomodified readonly noswapfile
|
setlocal nomodified readonly noswapfile
|
||||||
|
|||||||
Reference in New Issue
Block a user