From b27ee4d602d7ce6f7b7caf8e9ecb8eded57ffe0a Mon Sep 17 00:00:00 2001 From: Andy Stewart Date: Thu, 22 Feb 2018 16:23:17 +0000 Subject: [PATCH] Rename variable for clarity. --- autoload/gitgutter/diff.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autoload/gitgutter/diff.vim b/autoload/gitgutter/diff.vim index 5a8bc5a..c1bb6c8 100644 --- a/autoload/gitgutter/diff.vim +++ b/autoload/gitgutter/diff.vim @@ -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 " 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 " 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 " 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) if !empty(extension) - let blob_file .= '.'.extension + let index_file .= '.'.extension let buff_file .= '.'.extension endif " Write file from index to temporary file. - let blob_name = g:gitgutter_diff_base.':'.gitgutter#utility#repo_path(a:bufnr, 1) - let cmd .= g:gitgutter_git_executable.' show '.blob_name.' > '.blob_file.' && ' + let index_name = g:gitgutter_diff_base.':'.gitgutter#utility#repo_path(a:bufnr, 1) + let cmd .= g:gitgutter_git_executable.' show '.index_name.' > '.index_file.' && ' " Write buffer to temporary file. " 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.noprefix=false"' 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. if !a:preserve_full_diff && !empty(g:gitgutter_grep)