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

Update internal uses of :Git! to :Git --paginate

Browse Source
This commit is contained in:
Tim Pope
2020-02-19 00:06:51 -05:00
parent 8b83d6ec6c
commit c0aad3ac78
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autoload/fugitive.vim
View File

@@ -3354,16 +3354,16 @@ function! s:StageDiff(diff) abort
let prefix = info.offset > 0 ? '+' . info.offset : '' let prefix = info.offset > 0 ? '+' . info.offset : ''
if info.sub =~# '^S' if info.sub =~# '^S'
if info.section ==# 'Staged' if info.section ==# 'Staged'
return 'Git! diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0]
elseif info.sub =~# '^SC' elseif info.sub =~# '^SC'
return 'Git! diff --no-ext-diff --submodule=log -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=log -- ' . info.paths[0]
else else
return 'Git! diff --no-ext-diff --submodule=diff -- ' . info.paths[0] return 'Git --paginate diff --no-ext-diff --submodule=diff -- ' . info.paths[0]
endif endif
elseif empty(info.paths) && info.section ==# 'Staged' elseif empty(info.paths) && info.section ==# 'Staged'
return 'Git! diff --no-ext-diff --cached' return 'Git --paginate diff --no-ext-diff --cached'
elseif empty(info.paths) elseif empty(info.paths)
return 'Git! diff --no-ext-diff' return 'Git --paginate diff --no-ext-diff'
elseif len(info.paths) > 1 elseif len(info.paths) > 1
execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0]) execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0])
return a:diff . '! HEAD:'.s:fnameescape(info.paths[1]) return a:diff . '! HEAD:'.s:fnameescape(info.paths[1])
@@ -3386,12 +3386,12 @@ function! s:StageDiffEdit() abort
let info = s:StageInfo(line('.')) let info = s:StageInfo(line('.'))
let arg = (empty(info.paths) ? s:Tree() : info.paths[0]) let arg = (empty(info.paths) ? s:Tree() : info.paths[0])
if info.section ==# 'Staged' if info.section ==# 'Staged'
return 'Git! diff --no-ext-diff --cached '.s:fnameescape(arg) return 'Git --paginate diff --no-ext-diff --cached '.s:fnameescape(arg)
elseif info.status ==# '?' elseif info.status ==# '?'
call s:TreeChomp('add', '--intent-to-add', '--', arg) call s:TreeChomp('add', '--intent-to-add', '--', arg)
return s:ReloadStatus() return s:ReloadStatus()
else else
return 'Git! diff --no-ext-diff '.s:fnameescape(arg) return 'Git --paginate diff --no-ext-diff '.s:fnameescape(arg)
endif endif
endfunction endfunction