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/t1409-avoid-packing-refs.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'third_party/git/t/t1409-avoid-packing-refs.sh') diff --git a/third_party/git/t/t1409-avoid-packing-refs.sh b/third_party/git/t/t1409-avoid-packing-refs.sh index be12fb63506e..e5cb8a252dd1 100755 --- a/third_party/git/t/t1409-avoid-packing-refs.sh +++ b/third_party/git/t/t1409-avoid-packing-refs.sh @@ -8,7 +8,7 @@ test_description='avoid rewriting packed-refs unnecessarily' # shouldn't upset readers, and it should be omitted if the file is # ever rewritten. mark_packed_refs () { - sed -e "s/^\(#.*\)/\1 t1409 /" .git/packed-refs >.git/packed-refs.new && + sed -e "s/^\(#.*\)/\1 t1409 /" <.git/packed-refs >.git/packed-refs.new && mv .git/packed-refs.new .git/packed-refs } @@ -27,15 +27,15 @@ test_expect_success 'setup' ' ' test_expect_success 'do not create packed-refs file gratuitously' ' - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $A && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $B && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $C $B && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref -d refs/heads/foo && - test_path_is_missing .git/packed-refs + test_must_fail test -f .git/packed-refs ' test_expect_success 'check that marking the packed-refs file works' ' @@ -46,7 +46,7 @@ test_expect_success 'check that marking the packed-refs file works' ' git for-each-ref >actual && test_cmp expected actual && git pack-refs --all && - ! check_packed_refs_marked && + test_must_fail check_packed_refs_marked && git for-each-ref >actual2 && test_cmp expected actual2 ' @@ -80,7 +80,7 @@ test_expect_success 'touch packed-refs on delete of packed' ' git pack-refs --all && mark_packed_refs && git update-ref -d refs/heads/packed-delete && - ! check_packed_refs_marked + test_must_fail check_packed_refs_marked ' test_expect_success 'leave packed-refs untouched on update of loose' ' -- cgit 1.4.1