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/t6113-rev-list-bitmap-filters.sh | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100755 third_party/git/t/t6113-rev-list-bitmap-filters.sh (limited to 'third_party/git/t/t6113-rev-list-bitmap-filters.sh') diff --git a/third_party/git/t/t6113-rev-list-bitmap-filters.sh b/third_party/git/t/t6113-rev-list-bitmap-filters.sh deleted file mode 100755 index 145603f124..0000000000 --- a/third_party/git/t/t6113-rev-list-bitmap-filters.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -test_description='rev-list combining bitmaps and filters' -. ./test-lib.sh - -test_expect_success 'set up bitmapped repo' ' - # one commit will have bitmaps, the other will not - test_commit one && - test_commit much-larger-blob-one && - git repack -adb && - test_commit two && - test_commit much-larger-blob-two -' - -test_expect_success 'filters fallback to non-bitmap traversal' ' - # use a path-based filter, since they are inherently incompatible with - # bitmaps (i.e., this test will never get confused by later code to - # combine the features) - filter=$(echo "!one" | git hash-object -w --stdin) && - git rev-list --objects --filter=sparse:oid=$filter HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=sparse:oid=$filter HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'blob:none filter' ' - git rev-list --objects --filter=blob:none HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:none HEAD >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:none filter with specified blob' ' - git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:none HEAD HEAD:two.t >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:limit filter' ' - git rev-list --objects --filter=blob:limit=5 HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:limit=5 HEAD >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:limit filter with specified blob' ' - git rev-list --objects --filter=blob:limit=5 \ - HEAD HEAD:much-larger-blob-two.t >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:limit=5 \ - HEAD HEAD:much-larger-blob-two.t >actual && - test_bitmap_traversal expect actual -' - -test_done -- cgit 1.4.1