From: Jason Merrill <jason.merrill@gmail.com>
To: 21559@debbugs.gnu.org
Subject: bug#21559: 25.0.50; auto-revert-mode breaks git rebase
Date: Fri, 9 Sep 2016 16:56:23 -0400 [thread overview]
Message-ID: <CADTho6EMpX8WJC2b1Y=Lqv08+uC1pmF+hnoApfASJWPcyarsLw@mail.gmail.com> (raw)
In-Reply-To: <87wpvebraz.fsf@smart-cactus.org>
[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]
The problematic invocation of git status comes from
(defun vc-git-conflicted-files (directory)
"Return the list of files with conflicts in DIRECTORY."
(let* ((status
(vc-git--run-command-string directory "status" "--porcelain"
"--"))
I'm working around this issue by changing vc-git-conflicted-files to use
diff-files --name-status, which doesn't lock the index:
(defun vc-git-conflicted-files (directory)
"Return the list of files with conflicts in DIRECTORY."
(let* ((status
(vc-git--run-command-string directory "diff-files"
"--name-status"))
(lines (when status (split-string status "\n" 'omit-nulls)))
files)
;; TODO: Look into reimplementing `vc-git-state', as well as
;; `vc-git-dir-status-files', based on this output, thus making the
;; extra process call in `vc-git-find-file-hook' unnecessary.
(dolist (line lines files)
(when (string-match "\\([ MADRCU?!]\\)[ \t]+\\(.+\\)" line)
(let ((state (match-string 1 line))
(file (match-string 2 line)))
;; See git-status(1).
(when (equal state "U")
(push (expand-file-name file directory) files)))))))
[-- Attachment #2: Type: text/html, Size: 1999 bytes --]
next prev parent reply other threads:[~2016-09-09 20:56 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 [this message]
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 ` bug#21559: additional patch needed to set GIT_OPTIONAL_LOCKS=0 in all cases Andrew Ruder
2018-09-26 3:16 ` 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='CADTho6EMpX8WJC2b1Y=Lqv08+uC1pmF+hnoApfASJWPcyarsLw@mail.gmail.com' \
--to=jason.merrill@gmail.com \
--cc=21559@debbugs.gnu.org \
/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).