vc-git.el: Switch to using git-blame instead of git-annotate.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard committed
Oct 5, 2006 at 11:30 UTC
13f8e0b24b546c0da942ab8ebe334d6e55fe1ea6
1 file changed
+2
-2
contrib/emacs/vc-git.el
+2
-2
@@ -119,10 +119,10 @@
119
(defun vc-git-annotate-command (file buf &optional rev)
120
; FIXME: rev is ignored
121
(let ((name (file-relative-name file)))
122
- (call-process "git" nil buf nil "annotate" name)))
122
+ (call-process "git" nil buf nil "blame" name)))
123
124
(defun vc-git-annotate-time ()
125
- (and (re-search-forward "[0-9a-f]+\t(.*\t\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\)\t[0-9]+)" nil t)
125
+ (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t)
126
(vc-annotate-convert-time
127
(apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))
128