Skip to content

Commit 305fcf4

Browse files
committed
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
2 parents f74f5e7 + 03bb366 commit 305fcf4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

perl/Git/SVN/Log.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ sub cmd_show_log {
298298
get_author_info($c, $1, $2, $3);
299299
} elsif (/^${esc_color}(?:tree|parent|committer) /o) {
300300
# ignore
301-
} elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
301+
} elsif (/^${esc_color}:\d{6} \d{6} $::oid_short/o) {
302302
push @{$c->{raw}}, $_;
303303
} elsif (/^${esc_color}[ACRMDT]\t/) {
304304
# we could add $SVN->{svn_path} here, but that requires

0 commit comments

Comments
 (0)