(vc-git-annotate-extract-revision-at-line):

Allow "^" in a version name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbdf5ab03ad56935e51a1ec1a593085bde476d65..f7bacf9b31b502ab29ad1c51c09a34a2bdf6baec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * vc-git.el (vc-git-annotate-extract-revision-at-line):
+       Allow "^" in a version name.
+
        * vc-mtn.el (vc-mtn-state): Support the added state.
 
 2008-03-22  Carsten Dominik  <dominik@science.uva.nl>

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 8bbb16a62a014b8358cb3a0ba75b2c47d5410d24..36d17ad4a75ccb9d820b126797d480b266fa0739 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -400,7 +400,7 @@ or BRANCH^ (where \"^\" can be repeated)."
 (defun vc-git-annotate-extract-revision-at-line ()
   (save-excursion
     (move-beginning-of-line 1)
-    (and (looking-at "[0-9a-f]+")
+    (and (looking-at "[0-9a-f^][0-9a-f]+")
          (buffer-substring-no-properties (match-beginning 0) (match-end 0)))))
 
 ;;; SNAPSHOT SYSTEM