]> git.eshelyaron.com Git - emacs.git/commitdiff
vc-dir: ensure we don't use a pager with git
authorRobert Pluim <rpluim@gmail.com>
Fri, 10 Jan 2020 15:36:57 +0000 (16:36 +0100)
committerRobert Pluim <rpluim@gmail.com>
Mon, 13 Jan 2020 08:26:41 +0000 (09:26 +0100)
* 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

index 000d860e835607b56b0ae93a14d6abd385d34042..61e6c642d1f69050ede4010457aa78e70e6c329c 100644 (file)
@@ -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)))