emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 0ed9cfa: vc-dir: ensure we don't use a pager with git


From: Robert Pluim
Subject: emacs-27 0ed9cfa: vc-dir: ensure we don't use a pager with git
Date: Mon, 13 Jan 2020 03:34:54 -0500 (EST)

branch: emacs-27
commit 0ed9cfa7dc6e6333c975aca904efa5d19cd47974
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>

    vc-dir: ensure we don't use a pager with git
    
    * lisp/vc/vc-git.el (vc-git--call): Call git with '--no-pager' to
    avoid hangs caused by remote pager settings (Bug#38688).
---
 lisp/vc/vc-git.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 000d860..61e6c64 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1785,13 +1785,12 @@ The difference to vc-do-command is that this function 
always invokes
        (process-environment
         (append
          `("GIT_DIR"
-           "PAGER="
            ;; Avoid repository locking during background operations
            ;; (bug#21559).
            ,@(when revert-buffer-in-progress-p
                '("GIT_OPTIONAL_LOCKS=0")))
          process-environment)))
-    (apply 'process-file vc-git-program nil buffer nil command args)))
+    (apply 'process-file vc-git-program nil buffer nil "--no-pager" command 
args)))
 
 (defun vc-git--out-ok (command &rest args)
   (zerop (apply 'vc-git--call '(t nil) command args)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]