summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-05-20 11:16:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-20 16:30:09 (GMT)
commit9963e025e88f134cf07ef348d80a5821c69a7eb0 (patch)
treed3f9d846ebc3da5063246835fd4e237dd349334c /git-svn.perl
parent3d5ae435275e60be3ebd7302c1d2cf8ed6f0b8ad (diff)
downloadgit-9963e025e88f134cf07ef348d80a5821c69a7eb0.zip
git-9963e025e88f134cf07ef348d80a5821c69a7eb0.tar.gz
git-9963e025e88f134cf07ef348d80a5821c69a7eb0.tar.bz2
git-svn: Fix git svn log --show-commit
git svn log --show-commit had no tests and, consequently, no attention by the author of b1b4755 (git-log: put space after commit mark, 2011-03-10) who kept git svn log working only without --show-commit. Introduce a test and fix it. Reported-by: Bernt Hansen <bernt@norang.ca> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index bf0451b..da3fea8 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5752,7 +5752,7 @@ sub cmd_show_log {
my (@k, $c, $d, $stat);
my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
while (<$log>) {
- if (/^${esc_color}commit (- )?($::sha1_short)/o) {
+ if (/^${esc_color}commit (?:- )?($::sha1_short)/o) {
my $cmt = $1;
if ($c && cmt_showable($c) && $c->{r} != $r_last) {
$r_last = $c->{r};