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

Fix :Gstatus dp with external diff enabled

Browse Source 
Closes #341.
This commit is contained in:
Tim Pope
2013-05-17 23:58:10 -04:00
parent 54ead5abcb
commit 3b5f715262
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/fugitive.vim
View File

@@ -761,9 +761,9 @@ endfunction
function! s:StageDiff(diff) abort function! s:StageDiff(diff) abort
let [filename, section] = s:stage_info(line('.')) let [filename, section] = s:stage_info(line('.'))
if filename ==# '' && section ==# 'staged' if filename ==# '' && section ==# 'staged'
return 'Git! diff --cached' return 'Git! diff --no-ext-diff --cached'
elseif filename ==# '' elseif filename ==# ''
return 'Git! diff' return 'Git! diff --no-ext-diff'
elseif filename =~# ' -> ' elseif filename =~# ' -> '
let [old, new] = split(filename,' -> ') let [old, new] = split(filename,' -> ')
execute 'Gedit '.s:fnameescape(':0:'.new) execute 'Gedit '.s:fnameescape(':0:'.new)
@@ -781,7 +781,7 @@ function! s:StageDiffEdit() abort
let [filename, section] = s:stage_info(line('.')) let [filename, section] = s:stage_info(line('.'))
let arg = (filename ==# '' ? '.' : filename) let arg = (filename ==# '' ? '.' : filename)
if section ==# 'staged' if section ==# 'staged'
return 'Git! diff --cached '.s:shellesc(arg) return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg)
elseif section ==# 'untracked' elseif section ==# 'untracked'
let repo = s:repo() let repo = s:repo()
call repo.git_chomp_in_tree('add','--intent-to-add',arg) call repo.git_chomp_in_tree('add','--intent-to-add',arg)
@@ -796,7 +796,7 @@ function! s:StageDiffEdit() abort
endif endif
return '' return ''
else else
return 'Git! diff '.s:shellesc(arg) return 'Git! diff --no-ext-diff '.s:shellesc(arg)
endif endif
endfunction endfunction