diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-30 00:01:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-30 00:01:20 +0300 |
| commit | 288ed98bf768f4df9b569d51a52c233a1402c0f5 (patch) | |
| tree | 671cd2dddfb6b1adc8a9d1c7b516f4f5622bd092 /t/helper | |
| parent | c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8 (diff) | |
| parent | d356d5debe56b1e43b5ca674c662a08f25176f05 (diff) | |
Merge branch 'tb/bloom-improvements'
"git commit-graph write" learned to limit the number of bloom
filters that are computed from scratch with the --max-new-filters
option.
* tb/bloom-improvements:
commit-graph: introduce 'commitGraph.maxNewFilters'
builtin/commit-graph.c: introduce '--max-new-filters=<n>'
commit-graph: rename 'split_commit_graph_opts'
bloom: encode out-of-bounds filters as non-empty
bloom/diff: properly short-circuit on max_changes
bloom: use provided 'struct bloom_filter_settings'
bloom: split 'get_bloom_filter()' in two
commit-graph.c: store maximum changed paths
commit-graph: respect 'commitGraph.readChangedPaths'
t/helper/test-read-graph.c: prepare repo settings
commit-graph: pass a 'struct repository *' in more places
t4216: use an '&&'-chain
commit-graph: introduce 'get_bloom_filter_settings()'
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-bloom.c | 4 | ||||
| -rw-r--r-- | t/helper/test-read-graph.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index 5e77d56f59..46e97b04eb 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -39,7 +39,9 @@ static void get_bloom_filter_for_commit(const struct object_id *commit_oid) struct bloom_filter *filter; setup_git_directory(); c = lookup_commit(the_repository, commit_oid); - filter = get_bloom_filter(the_repository, c, 1); + filter = get_or_compute_bloom_filter(the_repository, c, 1, + &settings, + NULL); print_bloom_filter(filter); } diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c index 6d0c962438..5f585a1725 100644 --- a/t/helper/test-read-graph.c +++ b/t/helper/test-read-graph.c @@ -12,11 +12,12 @@ int cmd__read_graph(int argc, const char **argv) setup_git_directory(); odb = the_repository->objects->odb; + prepare_repo_settings(the_repository); + graph = read_commit_graph_one(the_repository, odb); if (!graph) return 1; - printf("header: %08x %d %d %d %d\n", ntohl(*(uint32_t*)graph->data), *(unsigned char*)(graph->data + 4), |