procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vc-dir: ensure we don't use a pager with git

Browse source 
* lisp/vc/vc-git.el (vc-git--call): Call git with '--no-pager' to
avoid hangs caused by remote pager settings (Bug#38688).
This commit is contained in:
Robert Pluim 2020-01-10 16:36:57 +01:00
parent 37e0d00c14
commit 0ed9cfa7dc
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/vc/vc-git.el
View file

@ -1785,13 +1785,12 @@ The difference to vc-do-command is that this function always invokes
(process-environment (process-environment
(append (append
`("GIT_DIR" `("GIT_DIR"
"PAGER="
;; Avoid repository locking during background operations ;; Avoid repository locking during background operations
;; (bug#21559). ;; (bug#21559).
,@(when revert-buffer-in-progress-p ,@(when revert-buffer-in-progress-p
'("GIT_OPTIONAL_LOCKS=0"))) '("GIT_OPTIONAL_LOCKS=0")))
process-environment))) 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) (defun vc-git--out-ok (command &rest args)
(zerop (apply 'vc-git--call '(t nil) command args))) (zerop (apply 'vc-git--call '(t nil) command args)))