Git.pm: make hash size independent

bk2204 · gitster · commit bcbb44ba0539 · 2019-04-01T11:57:39.000+09:00
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 &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ sub cat_blob {`
`980`	`980`	`return -1;`
`981`	`981`	`}`
`982`	`982`
`983`		`- if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {`
	`983`	`+ if ($description !~ /^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})? \S+ (\d+)$/) {`
`984`	`984`	`carp "Unexpected result returned from git cat-file";`
`985`	`985`	`return -1;`
`986`	`986`	`}`