From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t5604-clone-reference.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'third_party/git/t/t5604-clone-reference.sh') diff --git a/third_party/git/t/t5604-clone-reference.sh b/third_party/git/t/t5604-clone-reference.sh index 0c74b4e21a..4894237ab8 100755 --- a/third_party/git/t/t5604-clone-reference.sh +++ b/third_party/git/t/t5604-clone-reference.sh @@ -326,16 +326,15 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje for raw in $(ls T*.raw) do sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \ - -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 && - sort $raw.de-sha-1 >$raw.de-sha || return 1 + -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1 done && cat >expected-files <<-EOF && ./Y/Z ./Y/Z - ./Y/Z ./a-loose-dir/Z ./an-object + ./Y/Z ./info/packs ./pack/pack-Z.idx ./pack/pack-Z.pack -- cgit 1.4.1