diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:45 -0800 |
| commit | 305fcf42b4dde316ba0b2e6433c1e5a1d6ef864f (patch) | |
| tree | 2aba3f425ddcbbd1a31f8d32a6eee1bf0d79378f | |
| parent | Merge branch 'js/t7006-cleanup' (diff) | |
| parent | svn: use correct variable name for short OID (diff) | |
| download | tgif-305fcf42b4dde316ba0b2e6433c1e5a1d6ef864f.tar.xz | |
Merge branch 'bc/svn-hash-oid-fix'
A recent oid->hash conversion missed one spot, breaking "git svn".
* bc/svn-hash-oid-fix:
svn: use correct variable name for short OID
| -rw-r--r-- | perl/Git/SVN/Log.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm index 3858fcf27d..9c819188ea 100644 --- a/perl/Git/SVN/Log.pm +++ b/perl/Git/SVN/Log.pm @@ -298,7 +298,7 @@ sub cmd_show_log { get_author_info($c, $1, $2, $3); } elsif (/^${esc_color}(?:tree|parent|committer) /o) { # ignore - } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) { + } elsif (/^${esc_color}:\d{6} \d{6} $::oid_short/o) { push @{$c->{raw}}, $_; } elsif (/^${esc_color}[ACRMDT]\t/) { # we could add $SVN->{svn_path} here, but that requires |