[PATCH] Revert "git.el: Set process-environment instead of invoking env"
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:44:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
This reverts commit dbe48256b41c1e94d81f2458d7e84b1fdcb47026, which caused mis-encoding of non-ASCII author/committer names when the git-status mode is used to create commits. Signed-off-by: Karl Hasselström <redacted> --- On 2008-05-30 13:27:43 -0700, Junio C Hamano wrote:
Karl Hasselström [off-list ref] writes:quoted
How are things going with this fix? Junio, I expect you're waiting for a properly cleaned-up patch, possibly with acks from relevant people?You expected correctly.
In case no one who understands how, why, and whether the fix works comes forward, here's a revert of the commit that introduced the problem. contrib/emacs/git.el | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 2557a76..4fa853f 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el@@ -232,8 +232,10 @@ and returns the process output as a string, or nil if the git failed." (defun git-run-command-region (buffer start end env &rest args) "Run a git command with specified buffer region as input." - (unless (eq 0 (let ((process-environment (append (git-get-env-strings env) - process-environment))) + (unless (eq 0 (if env + (git-run-process-region + buffer start end "env" + (append (git-get-env-strings env) (list "git") args)) (git-run-process-region buffer start end "git" args))) (error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string))))
@@ -248,8 +250,9 @@ and returns the process output as a string, or nil if the git failed." (erase-buffer) (cd dir) (setq status - (let ((process-environment (append (git-get-env-strings env) - process-environment))) + (if env + (apply #'call-process "env" nil (list buffer t) nil + (append (git-get-env-strings env) (list hook-name) args)) (apply #'call-process hook-name nil (list buffer t) nil args)))) (display-message-or-buffer buffer) (eq 0 status)))))