diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2006-10-05 11:30:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-05 09:09:13 -0700 |
| commit | 13f8e0b24b546c0da942ab8ebe334d6e55fe1ea6 (patch) | |
| tree | 65f75138dcebf8bf79f4c0f85e60dd94b4619013 /contrib/emacs | |
| parent | c530c5aa31f44adafd1f4ecb05223024162e689c (diff) | |
| download | git-13f8e0b24b546c0da942ab8ebe334d6e55fe1ea6.tar.gz git-13f8e0b24b546c0da942ab8ebe334d6e55fe1ea6.tar.xz | |
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>
Diffstat (limited to 'contrib/emacs')
| -rw-r--r-- | contrib/emacs/vc-git.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el index 4a8f79092..4189c4ced 100644 --- a/contrib/emacs/vc-git.el +++ b/contrib/emacs/vc-git.el @@ -119,10 +119,10 @@ (defun vc-git-annotate-command (file buf &optional rev) ; FIXME: rev is ignored (let ((name (file-relative-name file))) - (call-process "git" nil buf nil "annotate" name))) + (call-process "git" nil buf nil "blame" name))) (defun vc-git-annotate-time () - (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) + (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) (vc-annotate-convert-time (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7)))))) |