From: Mitchel Humpherys <mitch.special@gmail.com>
To: Ben Gamari <ben@smart-cactus.org>
Cc: 21559@debbugs.gnu.org
Subject: bug#21559: 25.0.50; auto-revert-mode breaks git rebase
Date: Sat, 06 Feb 2016 21:21:34 -0800 [thread overview]
Message-ID: <877fih3xk1.fsf@gmail.com> (raw)
In-Reply-To: <87vb613ye0.fsf@gmail.com> (Mitchel Humpherys's message of "Sat, 06 Feb 2016 21:03:35 -0800")
On Sat, Feb 06 2016 at 09:03:35 PM, Mitchel Humpherys <mitch.special@gmail.com> wrote:
> On Sat, Feb 06 2016 at 05:34:49 PM, Mitchel Humpherys <mitch.special@gmail.com> wrote:
>> I took a quick look at the git source and the main source of this
>> particular error seems to be from the `git update-index' command. I see
>> that vc-git.el is calling `git update-index' in a few places but my
>> attempts at instrumenting the code to track down where it was coming
>> from were fruitless. I tried:
>>
>> (setq vc-command-messages t)
>>
>> as well as:
>>
>> (defun vc-git-command (buffer okstatus file-or-list &rest flags)
>> "A wrapper around `vc-do-command' for use in vc-git.el.
>> The difference to vc-do-command is that this function always invokes
>> `vc-git-program'."
>> (let ((coding-system-for-read vc-git-commits-coding-system)
>> (coding-system-for-write vc-git-commits-coding-system))
>> + (message "git: %s %s" file-or-list flags)
>>
>> Any ideas on how we can trace every git command that vc-git.el is
>> running? I'm suspicious that we're calling `git update-index' in the
>> auto revert path somewhere...
>
> Sorry, I take it all back. `git update-index' is the source of that one
> particular index.lock error message, but it's certainly not the only
> thing holding index.lock... And actually it looks like `git ls-files'
> does take index.lock:
>
> $ cd /path/to/emacs/
> $ git ls-files # in another shell after running the following inotifywait:
> $ inotifywait -m .git | grep index.lock
> Setting up watches.
> Watches established.
> .git/ CREATE index.lock
> .git/ OPEN index.lock
> .git/ CLOSE_WRITE,CLOSE index.lock
> .git/ DELETE index.lock
> .git/ CREATE index.lock
> .git/ OPEN index.lock
> .git/ CLOSE_WRITE,CLOSE index.lock
> .git/ DELETE index.lock
>
> I did a bit of git debugging and it looks like someone must be
> registering an atexit handler or something that takes index.lock,
> because it doesn't get taken in the ls-files code itself. It's taken
> sometime after the `exit' function gets called in `handle_builtin' in
> git.c.
>
> Anyways, I'm more inclined now to agree that this a git bug. I don't
> see why `git ls-files' would be taking index.lock... So we're back to
> the question of "how can Emacs handle this more gracefully".
SORRY! I take it all back AGAIN. It was actually my shell's PS1 that
was locking index.lock (due to a `git status'), not `git ls-files'!
That's why it looked like it was happening when the program exited.
Because it really was after the program exited :). That's
embarassing...
After re-running my experiment above in a non-fancy shell I don't see
index.lock being taken at all when I run `git ls-files'.
So we're back to instrumenting vc{,-git}.el to see exactly which git
commands are being run when auto-revert refreshes a buffer.
next prev parent reply other threads:[~2016-02-07 5:21 UTC|newest]
Thread overview: 50+ 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 ` [PATCH] autorevert: Wait a while " Ben Gamari
2015-10-26 18:43 ` bug#21559: " 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 [this message]
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 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877fih3xk1.fsf@gmail.com \
--to=mitch.special@gmail.com \
--cc=21559@debbugs.gnu.org \
--cc=ben@smart-cactus.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.