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, 28 deletions

diff --git a/third_party/git/t/t6000-rev-list-misc.sh b/third_party/git/t/t6000-rev-list-misc.sh
index 3dc1ad8f7199..52a9e38d66f3 100755
--- a/third_party/git/t/t6000-rev-list-misc.sh
+++ b/third_party/git/t/t6000-rev-list-misc.sh
@@ -104,16 +104,13 @@ test_expect_success 'rev-list can show index objects' '
 	#   - we do not show the root tree; since we updated the index, it
 	#     does not have a valid cache tree
 	#
+	cat >expect <<-\EOF &&
+	8e4020bb5a8d8c873b25de15933e75cc0fc275df one
+	d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
+	9200b628cf9dc883a85a7abc8d6e6730baee589c two
+	EOF
 	echo only-in-index >only-in-index &&
 	test_when_finished "git reset --hard" &&
-	rev1=$(git rev-parse HEAD:one) &&
-	rev2=$(git rev-parse HEAD:two) &&
-	revi=$(git hash-object only-in-index) &&
-	cat >expect <<-EOF &&
-	$rev1 one
-	$revi only-in-index
-	$rev2 two
-	EOF
 	git add only-in-index &&
 	git rev-list --objects --indexed-objects >actual &&
 	test_cmp expect actual
@@ -143,24 +140,4 @@ test_expect_success '--header shows a NUL after each commit' '
 	test_cmp expect actual
 '
 
-test_expect_success 'rev-list --end-of-options' '
-	git update-ref refs/heads/--output=yikes HEAD &&
-	git rev-list --end-of-options --output=yikes >actual &&
-	test_path_is_missing yikes &&
-	git rev-list HEAD >expect &&
-	test_cmp expect actual
-'
-
-test_expect_success 'rev-list --count' '
-	count=$(git rev-list --count HEAD) &&
-	git rev-list HEAD >actual &&
-	test_line_count = $count actual
-'
-
-test_expect_success 'rev-list --count --objects' '
-	count=$(git rev-list --count --objects HEAD) &&
-	git rev-list --objects HEAD >actual &&
-	test_line_count = $count actual
-'
-
 test_done