VimPlug/fzf.vim
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.vim.git synced 2025-12-07 05:04:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

delta --no-gitconfig

Browse Source 
Close #1205
This commit is contained in:
Junegunn Choi
2020-12-14 10:33:18 +09:00
parent 708c26aceb
commit a1f33472f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/fzf/vim.vim
View File

@@ -626,7 +626,7 @@ function! fzf#vim#gitfiles(args, ...)
let preview = printf( let preview = printf(
\ 'bash -c "if [[ {1} =~ M ]]; then %s; else %s {-1}; fi"', \ 'bash -c "if [[ {1} =~ M ]]; then %s; else %s {-1}; fi"',
\ executable('delta') \ executable('delta')
\ ? 'git diff -- {-1} | delta --file-style=omit | sed 1d' \ ? 'git diff -- {-1} | delta --no-gitconfig --file-style=omit | sed 1d'
\ : 'git diff --color=always -- {-1} | sed 1,4d', \ : 'git diff --color=always -- {-1} | sed 1,4d',
\ s:bin.preview) \ s:bin.preview)
let wrapped = fzf#wrap({ let wrapped = fzf#wrap({
@@ -1221,7 +1221,7 @@ function! s:commits(buffer_local, args)
endif endif
if !s:is_win && &columns > s:wide if !s:is_win && &columns > s:wide
let suffix = executable('delta') ? '| delta' : '--color=always' let suffix = executable('delta') ? '| delta --no-gitconfig' : '--color=always'
call extend(options.options, call extend(options.options,
\ ['--preview', 'echo {} | grep -o "[a-f0-9]\{7,\}" | head -1 | xargs git show --format=format: ' . suffix]) \ ['--preview', 'echo {} | grep -o "[a-f0-9]\{7,\}" | head -1 | xargs git show --format=format: ' . suffix])
endif endif