aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc/vc-git.el3
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
1785 (process-environment 1785 (process-environment
1786 (append 1786 (append
1787 `("GIT_DIR" 1787 `("GIT_DIR"
1788 "PAGER="
1789 ;; Avoid repository locking during background operations 1788 ;; Avoid repository locking during background operations
1790 ;; (bug#21559). 1789 ;; (bug#21559).
1791 ,@(when revert-buffer-in-progress-p 1790 ,@(when revert-buffer-in-progress-p
1792 '("GIT_OPTIONAL_LOCKS=0"))) 1791 '("GIT_OPTIONAL_LOCKS=0")))
1793 process-environment))) 1792 process-environment)))
1794 (apply 'process-file vc-git-program nil buffer nil command args))) 1793 (apply 'process-file vc-git-program nil buffer nil "--no-pager" command args)))
1795 1794
1796(defun vc-git--out-ok (command &rest args) 1795(defun vc-git--out-ok (command &rest args)
1797 (zerop (apply 'vc-git--call '(t nil) command args))) 1796 (zerop (apply 'vc-git--call '(t nil) command args)))