revert(3p/git): Revert merge of git upstream at v2.26.2 r/852

This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.

1 files changed, 5 insertions, 30 deletions

diff --git a/third_party/git/t/lib-pack.sh b/third_party/git/t/lib-pack.sh
index f3463170b39f..c4d907a450a7 100644
--- a/third_party/git/t/lib-pack.sh
+++ b/third_party/git/t/lib-pack.sh
@@ -35,11 +35,9 @@ pack_header () {
 # have hardcoded some well-known objects. See the case statements below for the
 # complete list.
 pack_obj () {
-	test_oid_init
-
 	case "$1" in
 	# empty blob
-	$EMPTY_BLOB)
+	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
 		case "$2" in
 		'')
 			printf '\060\170\234\003\0\0\0\0\1'
@@ -49,7 +47,7 @@ pack_obj () {
 		;;
 
 	# blob containing "\7\76"
-	$(test_oid packlib_7_76))
+	e68fe8129b546b101aee9510c5328e7f21ca1d18)
 		case "$2" in
 		'')
 			printf '\062\170\234\143\267\3\0\0\116\0\106'
@@ -61,18 +59,11 @@ pack_obj () {
 			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
 			return
 			;;
-		37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683)
-			printf '\165\67\310\342\301\133\262\53\221\56\131' &&
-			printf '\264\77\325\32\117\176\224\145\355\13\120' &&
-			printf '\204\305\241\101\35\231\34\276\143\6\203\170' &&
-			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
-			return
-			;;
 		esac
 		;;
 
 	# blob containing "\7\0"
-	$(test_oid packlib_7_0))
+	01d7713666f4de822776c7622c10f1b07de280dc)
 		case "$2" in
 		'')
 			printf '\062\170\234\143\147\0\0\0\20\0\10'
@@ -84,13 +75,6 @@ pack_obj () {
 			printf '\143\142\142\142\147\0\0\0\53\0\16'
 			return
 			;;
-		5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886)
-			printf '\165\135\216\157\304\17\55\253\0\346\230\72' &&
-			printf '\110\122\77\345\176\142\37\106\103\114\265' &&
-			printf '\215\275\104\42\373\240\63\200\330\206\170\234' &&
-			printf '\143\142\142\142\147\0\0\0\53\0\16'
-			return
-			;;
 		esac
 		;;
 	esac
@@ -102,7 +86,7 @@ pack_obj () {
 	then
 		echo "$1" | git pack-objects --stdout >pack_obj.tmp &&
 		size=$(wc -c <pack_obj.tmp) &&
-		dd if=pack_obj.tmp bs=1 count=$((size - $(test_oid rawsz) - 12)) skip=12 &&
+		dd if=pack_obj.tmp bs=1 count=$((size - 20 - 12)) skip=12 &&
 		rm -f pack_obj.tmp
 		return
 	fi
@@ -113,8 +97,7 @@ pack_obj () {
 
 # Compute and append pack trailer to "$1"
 pack_trailer () {
-	test_oid_init &&
-	test-tool $(test_oid algo) -b <"$1" >trailer.tmp &&
+	test-tool sha1 -b <"$1" >trailer.tmp &&
 	cat trailer.tmp >>"$1" &&
 	rm -f trailer.tmp
 }
@@ -125,11 +108,3 @@ pack_trailer () {
 clear_packs () {
 	rm -f .git/objects/pack/*
 }
-
-test_oid_cache <<-EOF
-packlib_7_0 sha1:01d7713666f4de822776c7622c10f1b07de280dc
-packlib_7_0 sha256:37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683
-
-packlib_7_76 sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
-packlib_7_76 sha256:5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886
-EOF