Merge branch 'maint'

* maint:
  git-svn: Fix git svn log --show-commit
This commit is contained in:
Junio C Hamano
2011-05-20 18:50:29 -07:00
2 changed files with 16 additions and 1 deletions

View File

@ -5765,7 +5765,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};