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, 6 insertions, 7 deletions

diff --git a/third_party/git/builtin/show-index.c b/third_party/git/builtin/show-index.c
index 0826f6a5a2c2..a6e678809efe 100644
--- a/third_party/git/builtin/show-index.c
+++ b/third_party/git/builtin/show-index.c
@@ -11,7 +11,6 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 	unsigned nr;
 	unsigned int version;
 	static unsigned int top_index[256];
-	const unsigned hashsz = the_hash_algo->rawsz;
 
 	if (argc != 1)
 		usage(show_index_usage);
@@ -37,23 +36,23 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 	}
 	if (version == 1) {
 		for (i = 0; i < nr; i++) {
-			unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)];
+			unsigned int offset, entry[6];
 
-			if (fread(entry, 4 + hashsz, 1, stdin) != 1)
+			if (fread(entry, 4 + 20, 1, stdin) != 1)
 				die("unable to read entry %u/%u", i, nr);
 			offset = ntohl(entry[0]);
-			printf("%u %s\n", offset, hash_to_hex((void *)(entry+1)));
+			printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1)));
 		}
 	} else {
 		unsigned off64_nr = 0;
 		struct {
-			struct object_id oid;
+			unsigned char sha1[20];
 			uint32_t crc;
 			uint32_t off;
 		} *entries;
 		ALLOC_ARRAY(entries, nr);
 		for (i = 0; i < nr; i++)
-			if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
+			if (fread(entries[i].sha1, 20, 1, stdin) != 1)
 				die("unable to read sha1 %u/%u", i, nr);
 		for (i = 0; i < nr; i++)
 			if (fread(&entries[i].crc, 4, 1, stdin) != 1)
@@ -78,7 +77,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 			}
 			printf("%" PRIuMAX " %s (%08"PRIx32")\n",
 			       (uintmax_t) offset,
-			       oid_to_hex(&entries[i].oid),
+			       sha1_to_hex(entries[i].sha1),
 			       ntohl(entries[i].crc));
 		}
 		free(entries);