diff options
| author | Robert Pluim <rpluim@gmail.com> | 2020-01-10 16:36:57 +0100 |
|---|---|---|
| committer | Robert Pluim <rpluim@gmail.com> | 2020-01-13 09:26:41 +0100 |
| commit | 0ed9cfa7dc6e6333c975aca904efa5d19cd47974 (patch) | |
| tree | 938d70ce712de7dadd30784c727133b70a9aa850 /lisp/vc/vc-git.el | |
| parent | 37e0d00c143ddb6d5e978eb1d3ac9c1d1aba3860 (diff) | |
| download | emacs-0ed9cfa7dc6e6333c975aca904efa5d19cd47974.tar.gz emacs-0ed9cfa7dc6e6333c975aca904efa5d19cd47974.tar.bz2 emacs-0ed9cfa7dc6e6333c975aca904efa5d19cd47974.zip | |
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).
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 000d860e835..61e6c642d1f 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))) |