From: Andrew Ruder <andy@aeruder.net>
To: 21559@debbugs.gnu.org
Cc: alexei.khlebnikov@gmail.com, michael.albinus@gmx.de, dgutov@yandex.ru
Subject: bug#21559: additional patch needed to set GIT_OPTIONAL_LOCKS=0 in all cases
Date: Tue, 25 Sep 2018 05:23:10 -0700 [thread overview]
Message-ID: <20180925122309.GB68323@aeruder.net> (raw)
In-Reply-To: <87wpvebraz.fsf@smart-cactus.org>
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Please see attached patch. There is also some early reports of
success at https://github.com/magit/magit/issues/2708
In short, I believe the analysis for this bug was thorough (and
correct!), but it turns out that the call to `git status` doesn't
actually go through the patched function so we'd end up with a few
commands getting GIT_OPTIONAL_LOCKS=0 but not the most important one.
- Andrew Ruder
P.S. still figuring out the contribution process for emacs.
[-- Attachment #2: 0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebase-B.patch --]
[-- Type: text/plain, Size: 1456 bytes --]
From b2a4c67cdd6fe834317416120b96ab943d6a1f7a Mon Sep 17 00:00:00 2001
From: Andrew Ruder <andy@aeruder.net>
Date: Mon, 24 Sep 2018 21:29:00 -0700
Subject: [PATCH] Fix for: "25.0.50; auto-revert-mode breaks git rebase"
(Bug#21559)
The fix for Bug#21559 is mostly right, but the one command we were
trying to protect, git status --porcelain, doesn't go through
vc-git-command and wasn't actually getting the GIT_OPTIONAL_LOCKS=0
treatment.
* lisp/vc/vc-git.el (vc-git--call): Override GIT_OPTIONAL_LOCKS=0
during revert-buffer-in-progress-p
---
lisp/vc/vc-git.el | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index ca457fb3d1..cc137b2304 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1628,8 +1628,15 @@ vc-git--call
(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)
--
2.17.0
next prev parent reply other threads:[~2018-09-25 12:23 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 12:45 bug#21559: 25.0.50; auto-revert-mode breaks git rebase Ben Gamari
2015-09-26 7:41 ` Eli Zaretskii
2015-09-28 14:11 ` Ben Gamari
2015-09-28 14:35 ` Eli Zaretskii
2015-09-28 15:05 ` Ben Gamari
2015-09-29 8:47 ` Michael Albinus
2015-10-26 18:43 ` bug#21559: [PATCH] autorevert: Wait for repository to become idle before calling vc-find-file-hook Ben Gamari
2015-10-26 18:43 ` bug#21559: [PATCH] autorevert: Wait a while " Ben Gamari
2015-10-27 8:25 ` Michael Albinus
2015-10-28 11:59 ` Ben Gamari
2015-10-28 14:45 ` Michael Albinus
2015-10-28 17:05 ` Ben Gamari
2015-10-29 8:20 ` Michael Albinus
2016-02-06 0:01 ` bug#21559: 25.0.50; auto-revert-mode breaks git rebase Mitchel Humpherys
2016-02-06 12:34 ` Ben Gamari
2016-02-07 1:34 ` Mitchel Humpherys
2016-02-07 5:03 ` Mitchel Humpherys
2016-02-07 5:21 ` Mitchel Humpherys
2016-02-07 10:22 ` Ben Gamari
2016-02-07 10:55 ` Ben Gamari
2016-02-07 17:06 ` Mitchel Humpherys
2016-02-07 17:22 ` Ben Gamari
2016-02-08 21:19 ` Daniel Colascione
2016-09-09 20:56 ` Jason Merrill
2018-02-14 10:08 ` Alexei Khlebnikov
2018-02-15 19:08 ` Alexei Khlebnikov
2018-02-15 22:32 ` Alexei Khlebnikov
2018-02-19 23:41 ` Dmitry Gutov
2018-02-20 0:06 ` Alexei Khlebnikov
2018-02-20 0:17 ` Dmitry Gutov
2018-02-20 4:07 ` Eli Zaretskii
2018-02-20 7:40 ` Michael Albinus
2018-02-20 11:37 ` Dmitry Gutov
2018-02-20 11:53 ` Michael Albinus
2018-02-20 22:28 ` Dmitry Gutov
2018-02-21 22:07 ` Alexei Khlebnikov
2018-02-22 11:24 ` Michael Albinus
2018-02-22 11:45 ` Dmitry Gutov
2018-02-19 10:24 ` bug#21559: PATCH review needed: lisp/vc/vc-git.el (vc-git-state, vc-git-conflicted-files) Alexei Khlebnikov
2018-02-19 12:39 ` Michael Albinus
2018-02-19 15:29 ` Eli Zaretskii
2018-02-19 18:39 ` Alexei Khlebnikov
2018-02-19 18:50 ` Michael Albinus
2018-02-19 19:05 ` Alexei Khlebnikov
2018-02-19 23:35 ` Dmitry Gutov
2018-09-25 12:23 ` Andrew Ruder [this message]
2018-09-26 3:16 ` bug#21559: additional patch needed to set GIT_OPTIONAL_LOCKS=0 in all cases Phil Sainty
2018-09-26 9:45 ` Michael Albinus
2018-09-29 11:16 ` Michael Albinus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180925122309.GB68323@aeruder.net \
--to=andy@aeruder.net \
--cc=21559@debbugs.gnu.org \
--cc=alexei.khlebnikov@gmail.com \
--cc=dgutov@yandex.ru \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).