Skip to content

Do not show empty split for Git help <cmd> on Windows #2420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not show empty split for Git help <cmd> on Windows #2420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions autoload/fugitive.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3759,10 +3759,29 @@ endfunction

function! fugitive#PagerFor(argv, ...) abort
let args = a:argv
let config = a:0 ? a:1 : fugitive#Config()
if empty(args)
return 0
elseif (args[0] ==# 'help' || get(args, 1, '') ==# '--help') && !s:HasOpt(args, '--web')
elseif len(args) == 1 && args[0] =~# '\v^(--help|help|-h)$'
return 1
elseif len(args) == 2 && args[0] ==# 'help' && args[1] =~# '\v^(-[ag]|--man)$'
return 1
elseif len(args) == 2 && args[1] ==# '-h'
return 1
elseif (args[0] ==# 'help' || get(args, 1, '') ==# '--help') && !s:HasOpt(args, '--web')
let helpFormat = get(fugitive#ConfigGetAll('help.format', config), 0, '')
if helpFormat ==# 'man' || helpFormat ==# 'info'
return 1
elseif helpFormat ==# 'web' || helpFormat ==# 'html'
return 0
elseif helpFormat ==# ''
" let isWinGit = has('win32')
let isWinGit = fugitive#GitVersion() =~# '\.\(windows\|msysgit\)\>'
return isWinGit ? 0 : 1
else
" unknown help format, assume pager
return 1
endif
endif
if args[0] ==# 'config' && (s:HasOpt(args, '-e', '--edit') ||
\ !s:HasOpt(args, '--list', '--get-all', '--get-regexp', '--get-urlmatch')) ||
Expand All @@ -3772,7 +3791,6 @@ function! fugitive#PagerFor(argv, ...) abort
\ !s:HasOpt(args, '--contains', '--no-contains', '--merged', '--no-merged', '--points-at'))
return 0
endif
let config = a:0 ? a:1 : fugitive#Config()
let value = get(fugitive#ConfigGetAll('pager.' . args[0], config), 0, -1)
if value =~# '^\%(true\|yes\|on\|1\)$'
return 1
Expand Down