mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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>
This commit is contained in:
parent
575fa8a3ed
commit
bcbb44ba05
1 changed files with 1 additions and 1 deletions
|
@ -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…
Reference in a new issue