From: claudio.bley@gmail.com (Claudio Bley)
To: 14459@debbugs.gnu.org
Subject: bug#14459: git vc-annotate fails in detached HEAD state
Date: Fri, 24 May 2013 15:07:37 +0200 [thread overview]
Message-ID: <87wqqopluu.wl%claudio.bley@gmail.com> (raw)
Hi.
1. I open a git versioned file with vc-git enabled in a directory
currently in detached HEAD state (e.g. after checking out a tag)
2. notice the mode line says "Git:!"
Now, when I do
C-x v g (vc-annotate)
The annotation buffer will be displayed, only saying
,----
| fatal: bad revision ''
`----
Apparently, vc-git-working-revision calls "git symbolic-ref HEAD",
which - in this case - gives:
$ git symbolic-ref HEAD
fatal: ref HEAD is not a symbolic ref
So, vc-git-working-revision returns an empty string as the current
"revision" vc-mode refers to.
M-: (vc-git-working-revision (buffer-file-name))
-> ""
When calling vc-annotate, the vc-git-annotate-command gets called with
the empty string for the rev parameter leading to the error.
This patch fixes it for me:
----------------- 8< --------------------- 8< -------------
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 06474cb..63a7115 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -885,7 +885,7 @@ or BRANCH^ (where \"^\" can be repeated)."
(defun vc-git-annotate-command (file buf &optional rev)
(let ((name (file-relative-name file)))
- (vc-git-command buf 'async nil "blame" "--date=iso" "-C" "-C" rev "--" name)))
+ (vc-git-command buf 'async nil "blame" "--date=iso" "-C" "-C" (if (> (length rev) 0) rev) "--" name)))
(declare-function vc-annotate-convert-time "vc-annotate" (time))
--
Claudio
next reply other threads:[~2013-05-24 13:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-24 13:07 Claudio Bley [this message]
2013-05-24 19:07 ` bug#14459: git vc-annotate fails in detached HEAD state Dmitry Gutov
2013-05-27 6:41 ` Claudio Bley
2013-05-27 15:10 ` Stefan Monnier
2013-05-27 23:14 ` Dmitry Gutov
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=87wqqopluu.wl%claudio.bley@gmail.com \
--to=claudio.bley@gmail.com \
--cc=14459@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).