From 09d1602de858ad1ce46a993fca20e1b573599fa9 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Fri, 10 Jan 2020 16:36:57 +0100 Subject: [PATCH] vc-dir: ensure we don't use a pager with git To: emacs-devel@gnu.org * 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 000d860e83..61e6c642d1 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1785,13 +1785,12 @@ vc-git--call (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))) -- 2.24.0.155.gd9f6f3b619