[Emacs-diffs] emacs-25 dc5e65b: Unset GIT_DIR when calling Git commands

[Dmitry Gutov]

branch: emacs-25
commit dc5e65b5deb2f5b67f6c3a06ae81c6b074bd4b56
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Unset GIT_DIR when calling Git commands
    
    * lisp/vc/vc-git.el (vc-git--call, vc-git-command):
    Unset GIT_DIR (bug#23769).
---
 lisp/vc/vc-git.el |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f35c84d..9eac5b2 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1423,7 +1423,8 @@ The difference to vc-do-command is that this function 
always invokes
   (let ((coding-system-for-read
          (or coding-system-for-read vc-git-log-output-coding-system))
        (coding-system-for-write
-         (or coding-system-for-write vc-git-commits-coding-system)))
+         (or coding-system-for-write vc-git-commits-coding-system))
+        (process-environment (cons "GIT_DIR" process-environment)))
     (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
           ;; http://debbugs.gnu.org/16897
           (unless (and (not (cdr-safe file-or-list))
@@ -1451,6 +1452,7 @@ The difference to vc-do-command is that this function 
always invokes
        (coding-system-for-write
          (or coding-system-for-write vc-git-commits-coding-system))
        (process-environment (cons "PAGER=" process-environment)))
+    (push "GIT_DIR" process-environment)
     (apply 'process-file vc-git-program nil buffer nil command args)))
 
 (defun vc-git--out-ok (command &rest args)