m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-09 12:03:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename variable for clarity.

Browse Source
This commit is contained in:
Andy Stewart
2018-02-22 16:23:17 +00:00
parent 816fc98ff2
commit b27ee4d602
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/gitgutter/diff.vim
View File

@@ -55,10 +55,10 @@ function! gitgutter#diff#run_diff(bufnr, preserve_full_diff) abort
" Append buffer number to avoid race conditions between writing and reading " Append buffer number to avoid race conditions between writing and reading
" the files when asynchronously processing multiple buffers. " the files when asynchronously processing multiple buffers.
" "
" Without the buffer number, blob_file would have a race in the shell " Without the buffer number, index_file would have a race in the shell
" between the second process writing it (with git-show) and the first " between the second process writing it (with git-show) and the first
" reading it (with git-diff). " reading it (with git-diff).
let blob_file = s:temp_index.'.'.a:bufnr let index_file = s:temp_index.'.'.a:bufnr
" Without the buffer number, buff_file would have a race between the " Without the buffer number, buff_file would have a race between the
" second gitgutter#process_buffer() writing the file (synchronously, below) " second gitgutter#process_buffer() writing the file (synchronously, below)
@@ -68,13 +68,13 @@ function! gitgutter#diff#run_diff(bufnr, preserve_full_diff) abort
let extension = gitgutter#utility#extension(a:bufnr) let extension = gitgutter#utility#extension(a:bufnr)
if !empty(extension) if !empty(extension)
let blob_file .= '.'.extension let index_file .= '.'.extension
let buff_file .= '.'.extension let buff_file .= '.'.extension
endif endif
" Write file from index to temporary file. " Write file from index to temporary file.
let blob_name = g:gitgutter_diff_base.':'.gitgutter#utility#repo_path(a:bufnr, 1) let index_name = g:gitgutter_diff_base.':'.gitgutter#utility#repo_path(a:bufnr, 1)
let cmd .= g:gitgutter_git_executable.' show '.blob_name.' > '.blob_file.' && ' let cmd .= g:gitgutter_git_executable.' show '.index_name.' > '.index_file.' && '
" Write buffer to temporary file. " Write buffer to temporary file.
" Note: this is synchronous. " Note: this is synchronous.
@@ -86,7 +86,7 @@ function! gitgutter#diff#run_diff(bufnr, preserve_full_diff) abort
let cmd .= ' -c "diff.autorefreshindex=0"' let cmd .= ' -c "diff.autorefreshindex=0"'
let cmd .= ' -c "diff.noprefix=false"' let cmd .= ' -c "diff.noprefix=false"'
endif endif
let cmd .= ' diff --no-ext-diff --no-color -U0 '.g:gitgutter_diff_args.' -- '.blob_file.' '.buff_file let cmd .= ' diff --no-ext-diff --no-color -U0 '.g:gitgutter_diff_args.' -- '.index_file.' '.buff_file
" Pipe git-diff output into grep. " Pipe git-diff output into grep.
if !a:preserve_full_diff && !empty(g:gitgutter_grep) if !a:preserve_full_diff && !empty(g:gitgutter_grep)