mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-22 14:01:47 -07:00
Code Issues Projects Releases Wiki Activity

Finish fix for Bug#21559

Browse source 
* lisp/vc/vc-git.el (vc-git--call):
If `revert-buffer-in-progress-p' flag is set, prepend
"GIT_OPTIONAL_LOCKS=0" to "process-environment".  (Bug#21559)
This commit is contained in:
Michael Albinus 2018-09-29 12:40:15 +02:00
parent 2296bf188f
commit fd369be7eb
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1628,8 +1628,15 @@ The difference to vc-do-command is that this function always invokes
(or coding-system-for-read vc-git-log-output-coding-system))
(coding-system-for-write
(or coding-system-for-write vc-git-commits-coding-system))
(process-environment (cons "PAGER=" process-environment)))
(push "GIT_DIR" process-environment)
(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)))
(defun vc-git--out-ok (command &rest args)