From: phillip.lord@russet.org.uk (Phillip Lord)
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 23769@debbugs.gnu.org
Subject: bug#23769: 25.0.95; Mode Line breakage in vc-git
Date: Thu, 16 Jun 2016 08:41:20 +0100 [thread overview]
Message-ID: <87vb19zilb.fsf@russet.org.uk> (raw)
In-Reply-To: <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> (Dmitry Gutov's message of "Thu, 16 Jun 2016 02:25:43 +0300")
Dmitry Gutov <dgutov@yandex.ru> writes:
> On 06/16/2016 01:09 AM, Phillip Lord wrote:
>> That situation does indeed happen. For example, I normally checkout
>> emacs into worktrees where you get this when commiting on emacs-25
>> branch which is a worktree off master.
>
> Does git-worktree use GIT_DIR in some way?
Well, it uses the directory that GIT_DIR points to (so
master/.git/worktrees/emacs-25 contains COMMIT_MSG, HEAD, index and so
on).
Whether is uses GIT_DIR, who knows. I pressume that all git commands
obey GIT_DIR.
>> There is a simpler option. I am trying to solve the root cause of the
>> problem but, as you say, that might be fraught. Since the problem only
>> seems to cause an error with vc-git-mode-line-string, we could just
>> discard the error from vc-git-working-revision in this case.
>
> That sounds like a last-resort option.
It's certainly true that it would nice to fix it elsewhere, but I am
unconvinced that setting the mode-line should ever result in an error as
a normal part of it's operation.
>> Failing that, now I know what the problem is, at least I have a
>> workaround (unset GIT_DIR in the pre-commit hook).
>
> We could also unset GIT_DIR locally inside vc-git--call. At least when
> it's set to a known value such as '.git'.
Yep; I guess, we know exactly what vc-git--call does with git, and if it
never depends on GIT_DIR that should work. Although setting and
unsetting GIT_DIR seems a bit of a pain.
Personally, I prefer my first option of calling git consistently --
always with CWD equal to root, and always with file paths relative to
the root. This way, GIT_DIR should not matter.
I presume the vc.el facade allows this, but if so, as this is going onto
master now, there is time.
Phil
next prev parent reply other threads:[~2016-06-16 7:41 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 11:16 bug#23769: 25.0.95; Mode Line breakage in vc-git Phillip Lord
2016-06-14 16:29 ` Glenn Morris
2016-06-14 17:03 ` Phillip Lord
2016-06-14 21:52 ` Dmitry Gutov
2016-06-14 22:21 ` Phillip Lord
2016-06-15 20:48 ` Phillip Lord
2016-06-15 21:02 ` Dmitry Gutov
2016-06-15 22:09 ` Phillip Lord
2016-06-15 22:27 ` Noam Postavsky
2016-06-15 23:20 ` Dmitry Gutov
2016-06-16 7:11 ` Phillip Lord
2016-06-16 7:45 ` Phillip Lord
2016-06-15 23:25 ` Dmitry Gutov
2016-06-16 7:41 ` Phillip Lord [this message]
2016-06-16 11:25 ` Dmitry Gutov
2016-06-16 16:06 ` Dmitry Gutov
2016-06-16 16:54 ` Noam Postavsky
2016-06-16 16:59 ` Dmitry Gutov
2016-06-16 21:47 ` Phillip Lord
2016-06-16 22:13 ` Dmitry Gutov
2016-06-16 22:23 ` Phillip Lord
2016-06-16 22:31 ` Dmitry Gutov
2016-06-16 22:42 ` Phillip Lord
2016-06-17 2:41 ` Dmitry Gutov
2016-06-17 3:37 ` Noam Postavsky
2016-06-17 6:54 ` Eli Zaretskii
2016-06-17 12:06 ` Dmitry Gutov
2016-06-17 13:21 ` Eli Zaretskii
2016-06-17 13:54 ` Dmitry Gutov
2016-06-17 15:09 ` Phillip Lord
2016-06-16 21:47 ` Phillip Lord
2016-06-16 22:04 ` Dmitry Gutov
2016-06-21 16:46 ` Dmitry Gutov
2016-06-21 20:45 ` Phillip Lord
2016-06-21 23:06 ` Dmitry Gutov
2016-06-15 21:56 ` John Wiegley
2016-06-14 21:30 ` Phillip Lord
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=87vb19zilb.fsf@russet.org.uk \
--to=phillip.lord@russet.org.uk \
--cc=23769@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
/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.