diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-30 20:20:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 20:20:31 (GMT) |
| commit | 70cdbbe3a7028b9c1eb7542a0aa038b971d3fb27 (patch) | |
| tree | 0bf9a4f33ed2d2bb1c21f11227ffdfa0212c8716 /commit-graph.h | |
| parent | de6dda0dc3d95cd9aaf43a7b85ceeb57316dcc27 (diff) | |
| parent | c525ce95b46b34f344c360dbef036cec3ea08e53 (diff) | |
| download | git-70cdbbe3a7028b9c1eb7542a0aa038b971d3fb27.zip git-70cdbbe3a7028b9c1eb7542a0aa038b971d3fb27.tar.gz git-70cdbbe3a7028b9c1eb7542a0aa038b971d3fb27.tar.bz2 | |
Merge branch 'ds/commit-graph-bloom-updates' into master
Updates to the changed-paths bloom filter.
* ds/commit-graph-bloom-updates:
commit-graph: check all leading directories in changed path Bloom filters
revision: empty pathspecs should not use Bloom filters
revision.c: fix whitespace
commit-graph: check chunk sizes after writing
commit-graph: simplify chunk writes into loop
commit-graph: unify the signatures of all write_graph_chunk_*() functions
commit-graph: persist existence of changed-paths
bloom: fix logic in get_bloom_filter()
commit-graph: change test to die on parse, not load
commit-graph: place bloom_settings in context
Diffstat (limited to 'commit-graph.h')
| -rw-r--r-- | commit-graph.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/commit-graph.h b/commit-graph.h index cf8d3c9..09a9703 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -6,7 +6,7 @@ #include "oidset.h" #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH" -#define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD" +#define GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE "GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE" #define GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS "GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS" /* @@ -92,6 +92,7 @@ enum commit_graph_write_flags { COMMIT_GRAPH_WRITE_PROGRESS = (1 << 1), COMMIT_GRAPH_WRITE_SPLIT = (1 << 2), COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 3), + COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS = (1 << 4), }; enum commit_graph_split_flags { |