diff options
| -rw-r--r-- | lisp/magit-git.el | 8 | ||||
| -rw-r--r-- | lisp/magit-process.el | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/magit-git.el b/lisp/magit-git.el index d66311d..06fcaef 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -103,11 +103,11 @@ this." (ignore-error file-missing (apply #'process-lines-ignore-status program args)))) -(defvar magit-git-w32-path-hack nil +(defvar magit--git-w32-path-hack nil "Alist of (EXE . (PATHENTRY)). This specifies what additional PATH setting needs to be added to the environment in order to run the non-wrapper git executables -successfully.") +successfully. Set when `magit-git-executable' is (re)initialized.") (defcustom magit-git-executable (or (and (eq system-type 'windows-nt) @@ -121,7 +121,7 @@ successfully.") exec "-c" "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x" "X" "git"))) - (hack-entry (assoc core-exe magit-git-w32-path-hack)) + (hack-entry (assoc core-exe magit--git-w32-path-hack)) ;; Running the libexec/git-core executable ;; requires some extra PATH entries. (path-hack @@ -135,7 +135,7 @@ successfully.") ;; idempotent. (if hack-entry (setcdr hack-entry path-hack) - (push (cons core-exe path-hack) magit-git-w32-path-hack)) + (push (cons core-exe path-hack) magit--git-w32-path-hack)) core-exe))) (and (eq system-type 'darwin) (executable-find "git")) diff --git a/lisp/magit-process.el b/lisp/magit-process.el index cdcea82..fde4810 100644 --- a/lisp/magit-process.el +++ b/lisp/magit-process.el @@ -545,7 +545,7 @@ eol conversion." (list (concat "SHADOWED_GITHOOK_DIRECTORY=" (magit--shadowed-githook-directory)))) (and local - (cdr (assoc magit-git-executable magit-git-w32-path-hack))) + (cdr (assoc magit-git-executable magit--git-w32-path-hack))) (and local magit-need-cygwin-noglob (mapcar (lambda (var) (concat var "=" (if-let ((val (getenv var))) |