mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 17:06:12 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2020-11-02 13:17:45 -08:00
parent f74f5e71d5 03bb366de4
commit 305fcf42b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl/Git/SVN/Log.pm
View File

@ -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