diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 18:50:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 18:50:29 -0700 |
| commit | 391b14278e59f46ceda3b055fdc12527bc2c87fb (patch) | |
| tree | 9617952a9fc6000744f6a80773fb36890cfa0ed5 /git-svn.perl | |
| parent | 11bc3e92bf036480ab31657825903b9b63ad9c49 (diff) | |
| parent | 9963e025e88f134cf07ef348d80a5821c69a7eb0 (diff) | |
| download | git-391b14278e59f46ceda3b055fdc12527bc2c87fb.tar.gz git-391b14278e59f46ceda3b055fdc12527bc2c87fb.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: Fix git svn log --show-commit
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index 0fd2fd218..7849cfc14 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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}; |