From 15df3f8959ea1aaff0604ff9ae93a6a969e7fffd Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Tue, 23 Jul 2019 13:42:19 -0400 Subject: [PATCH] Do what the user means for LANG= in g:fugitive_git_executable --- autoload/fugitive.vim | 4 +++- plugin/fugitive.vim | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 4c997f9..baa75b7 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -6,8 +6,10 @@ if exists('g:autoloaded_fugitive') endif let g:autoloaded_fugitive = 1 -if !exists('g:fugitive_git_executable') || g:fugitive_git_executable =~# '^LANG=' +if !exists('g:fugitive_git_executable') let g:fugitive_git_executable = 'git' +elseif g:fugitive_git_executable =~# '^\w\+=' + let g:fugitive_git_executable = 'env ' . g:fugitive_git_executable endif " Section: Utility diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim index 3bd3857..9688aab 100644 --- a/plugin/fugitive.vim +++ b/plugin/fugitive.vim @@ -8,10 +8,6 @@ if exists('g:loaded_fugitive') endif let g:loaded_fugitive = 1 -if get(g:, 'fugitive_git_executable', '') =~# '^LANG=' - echoerr 'Including "LANG=..." in g:fugitive_git_executable is no longer necessary or supported. Remove the "let g:fugitive_git_executable = ..." line from your vimrc.' -endif - function! FugitiveGitDir(...) abort if !a:0 || a:1 ==# -1 return get(b:, 'git_dir', '')