Browse Source

git.el: Set process-environment instead of invoking env

This will make it a little less posix-dependent, and more efficient.

Included is also a minor doc improvement.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Acked-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
David Kågedal 17 years ago committed by Junio C Hamano
parent
commit
f27e558643
  1. 7
      contrib/emacs/git.el

7
contrib/emacs/git.el

@ -185,9 +185,8 @@ if there is already one that displays the same directory." @@ -185,9 +185,8 @@ if there is already one that displays the same directory."

(defun git-call-process-env (buffer env &rest args)
"Wrapper for call-process that sets environment strings."
(if env
(apply #'call-process "env" nil buffer nil
(append (git-get-env-strings env) (list "git") args))
(let ((process-environment (append (git-get-env-strings env)
process-environment)))
(apply #'call-process "git" nil buffer nil args)))

(defun git-call-process-display-error (&rest args)
@ -204,7 +203,7 @@ if there is already one that displays the same directory." @@ -204,7 +203,7 @@ if there is already one that displays the same directory."

(defun git-call-process-env-string (env &rest args)
"Wrapper for call-process that sets environment strings,
and returns the process output as a string."
and returns the process output as a string, or nil if the git failed."
(with-temp-buffer
(and (eq 0 (apply #' git-call-process-env t env args))
(buffer-string))))

Loading…
Cancel
Save