mirror of
https://github.com/git/git.git
synced 2024-09-23 12:01:15 +02:00
9cf68b27d5
When providing an object filter, it is currently impossible to also filter provided items. E.g. when executing `git rev-list HEAD` , the commit this reference points to will be treated as user-provided and is thus excluded from the filtering mechanism. This makes it harder than necessary to properly use the new `--filter=object:type` filter given that even if the user wants to only see blobs, he'll still see commits of provided references. Improve this by introducing a new `--filter-provided-objects` option to the git-rev-parse(1) command. If given, then all user-provided references will be subject to filtering. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
145 lines
5.2 KiB
Bash
Executable File
145 lines
5.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='rev-list combining bitmaps and filters'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-bitmap.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 &&
|
|
git tag tag
|
|
'
|
|
|
|
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_expect_success 'tree:0 filter' '
|
|
git rev-list --objects --filter=tree:0 HEAD >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=tree:0 HEAD >actual &&
|
|
test_bitmap_traversal expect actual
|
|
'
|
|
|
|
test_expect_success 'tree:0 filter with specified blob, tree' '
|
|
git rev-list --objects --filter=tree:0 HEAD HEAD:two.t >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=tree:0 HEAD HEAD:two.t >actual &&
|
|
test_bitmap_traversal expect actual
|
|
'
|
|
|
|
test_expect_success 'tree:1 filter' '
|
|
git rev-list --objects --filter=tree:1 HEAD >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=tree:1 HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'object:type filter' '
|
|
git rev-list --objects --filter=object:type=tag tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=object:type=tag tag >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
git rev-list --objects --filter=object:type=commit tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=object:type=commit tag >actual &&
|
|
test_bitmap_traversal expect actual &&
|
|
|
|
git rev-list --objects --filter=object:type=tree tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=object:type=tree tag >actual &&
|
|
test_bitmap_traversal expect actual &&
|
|
|
|
git rev-list --objects --filter=object:type=blob tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=object:type=blob tag >actual &&
|
|
test_bitmap_traversal expect actual
|
|
'
|
|
|
|
test_expect_success 'object:type filter with --filter-provided-objects' '
|
|
git rev-list --objects --filter-provided-objects --filter=object:type=tag tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter-provided-objects --filter=object:type=tag tag >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
git rev-list --objects --filter-provided-objects --filter=object:type=commit tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter-provided-objects --filter=object:type=commit tag >actual &&
|
|
test_bitmap_traversal expect actual &&
|
|
|
|
git rev-list --objects --filter-provided-objects --filter=object:type=tree tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter-provided-objects --filter=object:type=tree tag >actual &&
|
|
test_bitmap_traversal expect actual &&
|
|
|
|
git rev-list --objects --filter-provided-objects --filter=object:type=blob tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter-provided-objects --filter=object:type=blob tag >actual &&
|
|
test_bitmap_traversal expect actual
|
|
'
|
|
|
|
test_expect_success 'combine filter' '
|
|
git rev-list --objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
|
|
test_bitmap_traversal expect actual
|
|
'
|
|
|
|
test_expect_success 'combine filter with --filter-provided-objects' '
|
|
git rev-list --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
|
|
git rev-list --use-bitmap-index \
|
|
--objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
|
|
test_bitmap_traversal expect actual &&
|
|
|
|
git cat-file --batch-check="%(objecttype) %(objectsize)" <actual >objects &&
|
|
while read objecttype objectsize
|
|
do
|
|
test "$objecttype" = blob || return 1
|
|
test "$objectsize" -le 1000 || return 1
|
|
done <objects
|
|
'
|
|
|
|
test_done
|