From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D5B7F1F4B4 for ; Wed, 16 Sep 2020 18:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727701AbgIPSHu (ORCPT ); Wed, 16 Sep 2020 14:07:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727502AbgIPSHY (ORCPT ); Wed, 16 Sep 2020 14:07:24 -0400 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7249FC06174A for ; Wed, 16 Sep 2020 11:07:23 -0700 (PDT) Received: by mail-qt1-x841.google.com with SMTP id h6so6860914qtd.6 for ; Wed, 16 Sep 2020 11:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fHeBI0pYi99YmdtyHfymBlwTOfC71IZPo55pMaYLjxs=; b=LwCMF8KriEvdkjysa7G+YYbcEKpkfQkbk1MujJP26HX9+hvOdS+dqwI3yh7QID9SBT efQOUhFuDwx+XqL8xF4Gs0duhkSmrPiHFwhUiGiwHOrpf6Q+eWv7GxjaPbAp4sCop74s 5LQIY4JEjkxfhucIQgyRdRK2an4YrPQjqqo6Lv7x7i9/3BrnxgTJnyhgNOCu3B5sG1dW Ok0nHkxqbnIx6MZU2y+TeN9PQWSg9DO6GVvfWjf2UHO5+TRAg7WFn/ms9s+oi3+thWJL BSA/vwDZYpi/0xg8hoafaw8+UyqoVZRWCAdf6l3VfQSYcTA3U5HeP4H2iugieYfI4Rp+ wLdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fHeBI0pYi99YmdtyHfymBlwTOfC71IZPo55pMaYLjxs=; b=XU/W6iu6ELUZeqky2FYZ8F3k7IHH5bZQ5KfFlMXB/4NpyuphS4pLCicoqkhtR7umq6 ivvOHxgsi+U/SubWjO85BGOijfsYRaCOzr89g19mUwgbIVHYaVlYN6lD2b4vdHKILv5b NceYHUfeunR5K72Qlyz++rS3Yihcge8gRk7kZd3imnAiHmG/4mwrL4F+7ATBEB+syzgR f14/If7SNy8CT/0K6cVY1ldR99vd4UUtLGCZOD1ArV+cKbtkkUHGcUo8UGe4+OpH81Bl yhdkHqIa+FeKK+8i4m5Ch+DiPVJk7gU4T9ZEwKTOTIXqktEY8cP5kqzNfPfTbEyePd25 doaA== X-Gm-Message-State: AOAM532PbQ3uOUnEKWSn78+fpCx/kUNTz2Uu1p14idBwABIY1lsPsuZp P2X4ZrRvziUBkLNdr8BMe/fG4Ac0Ne0UqZsL X-Google-Smtp-Source: ABdhPJyiNhaSWIWZXRXU6Buecd9zRFkRgkGGuQLSnV3eh0sTFvCU9mDWxuzQeTCyTOlzicFBPlYV3w== X-Received: by 2002:ac8:43d3:: with SMTP id w19mr25230612qtn.129.1600279642344; Wed, 16 Sep 2020 11:07:22 -0700 (PDT) Received: from localhost ([2605:9480:22e:ff10:e86e:6adf:7537:ae24]) by smtp.gmail.com with ESMTPSA id h68sm20375585qkf.30.2020.09.16.11.07.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:07:21 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:19 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: dstolee@microsoft.com, gitster@pobox.com, peff@peff.net, szeder.dev@gmail.com Subject: [PATCH v2 05/13] commit-graph: respect 'commitGraph.readChangedPaths' Message-ID: <29bc0d07c9422d58ae19750390bb08b8c739a03e.1600279373.git.me@ttaylorr.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Git uses the 'core.commitGraph' configuration value to control whether or not the commit graph is used when parsing commits or performing a traversal. Now that commit-graphs can also contain a section for changed-path Bloom filters, administrators that already have commit-graphs may find it convenient to use those graphs without relying on their changed-path Bloom filters. This can happen, for example, during a staged roll-out, or in the event of an incident. Introduce 'commitGraph.readChangedPaths' to control whether or not Bloom filters are read. Note that this configuration is independent from both: - 'core.commitGraph', to allow flexibility in using all parts of a commit-graph _except_ for its Bloom filters. - The '--changed-paths' option for 'git commit-graph write', to allow reading and writing Bloom filters to be controlled independently. When the variable is set, pretend as if no Bloom data was specified at all. This avoids adding additional special-casing outside of the commit-graph internals. Suggested-by: Derrick Stolee Signed-off-by: Taylor Blau --- Documentation/config.txt | 2 ++ Documentation/config/commitgraph.txt | 4 ++++ commit-graph.c | 6 ++++-- repo-settings.c | 3 +++ repository.h | 1 + t/t4216-log-bloom.sh | 4 +++- 6 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/commitgraph.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3042d80978..770ae79b82 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -340,6 +340,8 @@ include::config/column.txt[] include::config/commit.txt[] +include::config/commitgraph.txt[] + include::config/credential.txt[] include::config/completion.txt[] diff --git a/Documentation/config/commitgraph.txt b/Documentation/config/commitgraph.txt new file mode 100644 index 0000000000..cff0797b54 --- /dev/null +++ b/Documentation/config/commitgraph.txt @@ -0,0 +1,4 @@ +commitGraph.readChangedPaths:: + If true, then git will use the changed-path Bloom filters in the + commit-graph file (if it exists, and they are present). Defaults to + true. See linkgit:git-commit-graph[1] for more information. diff --git a/commit-graph.c b/commit-graph.c index 72a838bd00..ea54d108b9 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -327,6 +327,8 @@ struct commit_graph *parse_commit_graph(struct repository *r, return NULL; } + prepare_repo_settings(r); + graph = alloc_commit_graph(); graph->hash_len = the_hash_algo->rawsz; @@ -403,14 +405,14 @@ struct commit_graph *parse_commit_graph(struct repository *r, case GRAPH_CHUNKID_BLOOMINDEXES: if (graph->chunk_bloom_indexes) chunk_repeated = 1; - else + else if (r->settings.commit_graph_read_changed_paths) graph->chunk_bloom_indexes = data + chunk_offset; break; case GRAPH_CHUNKID_BLOOMDATA: if (graph->chunk_bloom_data) chunk_repeated = 1; - else { + else if (r->settings.commit_graph_read_changed_paths) { uint32_t hash_version; graph->chunk_bloom_data = data + chunk_offset; hash_version = get_be32(data + chunk_offset); diff --git a/repo-settings.c b/repo-settings.c index aa61a35338..88ccce2036 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -17,9 +17,12 @@ void prepare_repo_settings(struct repository *r) if (!repo_config_get_bool(r, "core.commitgraph", &value)) r->settings.core_commit_graph = value; + if (!repo_config_get_bool(r, "commitgraph.readchangedpaths", &value)) + r->settings.commit_graph_read_changed_paths = value; if (!repo_config_get_bool(r, "gc.writecommitgraph", &value)) r->settings.gc_write_commit_graph = value; UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1); + UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1); UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1); if (!repo_config_get_int(r, "index.version", &value)) diff --git a/repository.h b/repository.h index 628c834367..bacf843d46 100644 --- a/repository.h +++ b/repository.h @@ -30,6 +30,7 @@ struct repo_settings { int initialized; int core_commit_graph; + int commit_graph_read_changed_paths; int gc_write_commit_graph; int fetch_write_commit_graph; diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index cd89c75002..fc7693806c 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -95,7 +95,9 @@ do "--ancestry-path side..master" do test_expect_success "git log option: $option for path: $path" ' - test_bloom_filters_used "$option -- $path" + test_bloom_filters_used "$option -- $path" && + test_config commitgraph.readChangedPaths false && + test_bloom_filters_not_used "$option -- $path" ' done done -- 2.28.0.510.g86fdc5f89a