about summary refs log tree commit diff
path: root/third_party/git/t/t1500-rev-parse.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t1500-rev-parse.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
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.
Diffstat (limited to 'third_party/git/t/t1500-rev-parse.sh')
-rwxr-xr-xthird_party/git/t/t1500-rev-parse.sh25
1 files changed, 0 insertions, 25 deletions
diff --git a/third_party/git/t/t1500-rev-parse.sh b/third_party/git/t/t1500-rev-parse.sh
index 603019b54167..01abee533ded 100755
--- a/third_party/git/t/t1500-rev-parse.sh
+++ b/third_party/git/t/t1500-rev-parse.sh
@@ -59,7 +59,6 @@ test_rev_parse () {
 ROOT=$(pwd)
 
 test_expect_success 'setup' '
-	test_oid_init &&
 	mkdir -p sub/dir work &&
 	cp -R .git repo.git
 '
@@ -132,30 +131,6 @@ test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
 	test_cmp expect actual
 '
 
-test_expect_success 'rev-parse --show-object-format in repo' '
-	echo "$(test_oid algo)" >expect &&
-	git rev-parse --show-object-format >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=storage >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=input >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=output >actual &&
-	test_cmp expect actual &&
-	test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err &&
-	grep "unknown mode for --show-object-format: squeamish-ossifrage" err
-'
-
-test_expect_success '--show-toplevel from subdir of working tree' '
-	pwd >expect &&
-	git -C sub/dir rev-parse --show-toplevel >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success '--show-toplevel from inside .git' '
-	test_must_fail git -C .git rev-parse --show-toplevel
-'
-
 test_expect_success 'showing the superproject correctly' '
 	git rev-parse --show-superproject-working-tree >out &&
 	test_must_be_empty out &&