Browse Source

Git.pm: make hash size independent

The cat_blob function was matching on exactly 40 hex characters.  This
won't work with SHA-256, which uses 64-character hex object IDs.  While
it should be fine to simply match any number of hex characters since the
output is space delimited, be extra safe by matching either exactly 40
or exactly 64 hex characters.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 6 years ago committed by Junio C Hamano
parent
commit
bcbb44ba05
  1. 2
      perl/Git.pm

2
perl/Git.pm

@ -980,7 +980,7 @@ sub cat_blob { @@ -980,7 +980,7 @@ sub cat_blob {
return -1;
}

if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
if ($description !~ /^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})? \S+ (\d+)$/) {
carp "Unexpected result returned from git cat-file";
return -1;
}

Loading…
Cancel
Save