From 1382847bc7153fb174f78942672ecf7a0d4f569c Mon Sep 17 00:00:00 2001
From: Simon Podhajsky <simon.podhajsky@gmail.com>
Date: Wed, 12 Apr 2017 19:37:15 -0400
Subject: [PATCH] Unset GIT_DIR to unmess git calls. Fix #807.

Vundle manipulates plugin folders by `cd`-ing into them and calling git
via `call system(cmd)`. This doesn't work if GIT_DIR is set as a global
environmental variable (most commonly by a git hook). Since there is no
use case in which Vundle should respect GIT_DIR, this PR preemptively
precedes all git calls with `unset GIT_DIR; `. This makes the git calls
behave as expected without unsetting GIT_DIR in the environment beyond
vim.
---
 autoload/vundle/installer.vim | 10 +++++-----
 autoload/vundle/scripts.vim   |  2 +-
 test/vimrc                    |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim
index 614b64b..3029c92 100644
--- a/autoload/vundle/installer.vim
+++ b/autoload/vundle/installer.vim
@@ -330,7 +330,7 @@ endf
 " return -- the URL for the origin remote (string)
 " ---------------------------------------------------------------------------
 func! s:get_current_origin_url(bundle) abort
-  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
+  let cmd = 'unset GIT_DIR; cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
   let cmd = vundle#installer#shellesc_cd(cmd)
   let out = s:strip(s:system(cmd))
   return out
@@ -344,7 +344,7 @@ endf
 " return -- A 15 character log sha for the current HEAD
 " ---------------------------------------------------------------------------
 func! s:get_current_sha(bundle)
-  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
+  let cmd = 'unset GIT_DIR; cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
   let cmd = vundle#installer#shellesc_cd(cmd)
   let out = s:system(cmd)[0:15]
   return out
@@ -375,7 +375,7 @@ func! s:make_sync_command(bang, bundle) abort
       call s:log('>  Plugin ' . a:bundle.name . ' new URI: ' . a:bundle.uri)
       " Directory names match but the origin remotes are not the same
       let cmd_parts = [
-                  \ 'cd '.vundle#installer#shellesc(a:bundle.path()) ,
+                  \ 'unset GIT_DIR; cd '.vundle#installer#shellesc(a:bundle.path()) ,
                   \ 'git remote set-url origin ' . vundle#installer#shellesc(a:bundle.uri),
                   \ 'git fetch',
                   \ 'git reset --hard origin/HEAD',
@@ -393,7 +393,7 @@ func! s:make_sync_command(bang, bundle) abort
     endif
 
     let cmd_parts = [
-                \ 'cd '.vundle#installer#shellesc(a:bundle.path()),
+                \ 'unset GIT_DIR; cd '.vundle#installer#shellesc(a:bundle.path()),
                 \ 'git pull',
                 \ 'git submodule update --init --recursive',
                 \ ]
@@ -402,7 +402,7 @@ func! s:make_sync_command(bang, bundle) abort
 
     let initial_sha = s:get_current_sha(a:bundle)
   else
-    let cmd = 'git clone --recursive '.vundle#installer#shellesc(a:bundle.uri).' '.vundle#installer#shellesc(a:bundle.path())
+    let cmd = 'unset GIT_DIR; git clone --recursive '.vundle#installer#shellesc(a:bundle.uri).' '.vundle#installer#shellesc(a:bundle.path())
     let initial_sha = ''
   endif
   return [cmd, initial_sha]
diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim
index d7409a1..dc97731 100644
--- a/autoload/vundle/scripts.vim
+++ b/autoload/vundle/scripts.vim
@@ -68,7 +68,7 @@ func! s:create_changelog() abort
     let updated_sha = bundle_data[1]
     let bundle      = bundle_data[2]
 
-    let cmd = 'cd '.vundle#installer#shellesc(bundle.path()).
+    let cmd = 'unset GIT_DIR; cd '.vundle#installer#shellesc(bundle.path()).
           \              ' && git log --pretty=format:"%s   %an, %ar" --graph '.
           \               initial_sha.'..'.updated_sha
 
diff --git a/test/vimrc b/test/vimrc
index d8455a7..eb09eb9 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -75,6 +75,8 @@ set wildignore+=*/.git/*
 " set wildignore+=doc/*        " should not break clone
 " set wildignore+=*/doc/*
 
+let $GIT_DIR='/tmp'            " should not break any git commands
+
 au VimEnter * BundleInstall
 
 " e test/files/erlang.erl