aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-10-14 07:05:07 +0000
committerDan Nicolaescu2008-10-14 07:05:07 +0000
commit07ebab66581c7ce586d976ffffc9a429540df1ab (patch)
treef85bec2b4fecc04216f460a04cf33c4eef901f5e
parent95d610cb981ef34896c67f5f07ccb2cff698693c (diff)
downloademacs-07ebab66581c7ce586d976ffffc9a429540df1ab.tar.gz
emacs-07ebab66581c7ce586d976ffffc9a429540df1ab.zip
* vc-git.el (vc-git-show-log-entry): Include the revision in the
search string.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-git.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f9e909b1aa..21e5953779f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-10-14 Eric Hanchrow <offby1@blarg.net> (tiny change)
2
3 * vc-git.el (vc-git-show-log-entry): Include the revision in the
4 search string.
5
12008-10-14 Michael Albinus <michael.albinus@gmx.de> 62008-10-14 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-process-one-action): Embed regexp in 8 * net/tramp.el (tramp-process-one-action): Embed regexp in
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 90d8ee1289a..aa4b1bb6f16 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -492,7 +492,7 @@ REVISION may have the form BRANCH, BRANCH~N,
492or BRANCH^ (where \"^\" can be repeated)." 492or BRANCH^ (where \"^\" can be repeated)."
493 (goto-char (point-min)) 493 (goto-char (point-min))
494 (when revision 494 (when revision
495 (search-forward "\ncommit" nil t 495 (search-forward (format "\ncommit %s" revision) nil t
496 (cond ((string-match "~\\([0-9]\\)$" revision) 496 (cond ((string-match "~\\([0-9]\\)$" revision)
497 (1+ (string-to-number (match-string 1 revision)))) 497 (1+ (string-to-number (match-string 1 revision))))
498 ((string-match "\\^+$" revision) 498 ((string-match "\\^+$" revision)