From: Victoria Dye <vdye@github.com>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: me@ttaylorr.com, newren@gmail.com, gitster@pobox.com,
Jeff King <peff@peff.net>,
Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH v2 3/3] repository: create read_replace_refs setting
Date: Mon, 5 Jun 2023 12:32:46 -0700 [thread overview]
Message-ID: <f8094f2d-fbf7-3379-a630-781eb09cce64@github.com> (raw)
In-Reply-To: <4c7dbeb8c6dd6ab4c1903196967d5e0906a293c2.1685716158.git.gitgitgadget@gmail.com>
Derrick Stolee via GitGitGadget wrote:
> diff --git a/repository.h b/repository.h
> index c42f7ab6bdc..5315e0852e3 100644
> --- a/repository.h
> +++ b/repository.h
> @@ -39,6 +39,15 @@ struct repo_settings {
> int pack_read_reverse_index;
> int pack_use_bitmap_boundary_traversal;
>
> + /*
> + * Has this repository have core.useReplaceRefs=true (on by
s/Has/Does(?)
It's not a huge deal, but if you were planning to re-roll anyway due to [1],
this should be easy enough to include.
[1] https://lore.kernel.org/git/a1967c58-48c5-6ae0-f60a-2d8c107f8f66@web.de/
> + * default)? This provides a repository-scoped version of this
> + * config, though it could be disabled process-wide via some Git
> + * builtins or the --no-replace-objects option. See
> + * replace_refs_enabled() for more details.
> + */
> + int read_replace_refs;
> +
> struct fsmonitor_settings *fsmonitor; /* lazily loaded */
>
> int index_version;
> diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
> index 8143817b19e..d37c83b4640 100755
> --- a/t/t7814-grep-recurse-submodules.sh
> +++ b/t/t7814-grep-recurse-submodules.sh
> @@ -594,4 +594,44 @@ test_expect_success 'grep partially-cloned submodule' '
> )
> '
>
> +test_expect_success 'check scope of core.useReplaceRefs' '
> + git init base &&
> + git init base/sub &&
> +
> + echo A >base/a &&
> + echo B >base/b &&
> + echo C >base/sub/c &&
> + echo D >base/sub/d &&
> +
> + git -C base/sub add c d &&
> + git -C base/sub commit -m "Add files" &&
> +
> + git -C base submodule add ./sub &&
> + git -C base add a b sub &&
> + git -C base commit -m "Add files and submodule" &&
> +
> + A=$(git -C base rev-parse HEAD:a) &&
> + B=$(git -C base rev-parse HEAD:b) &&
> + C=$(git -C base/sub rev-parse HEAD:c) &&
> + D=$(git -C base/sub rev-parse HEAD:d) &&
> +
> + git -C base replace $A $B &&
> + git -C base/sub replace $C $D &&
> +
> + test_must_fail git -C base grep --cached --recurse-submodules A &&
> + test_must_fail git -C base grep --cached --recurse-submodules C &&
First, we verify that replace refs are enabled on both the superproject and
submodule by default (if they are, 'a' has been replaced with 'b' and 'c'
has been replaced with 'd')...
> +
> + git -C base config core.useReplaceRefs false &&
> + git -C base grep --recurse-submodules A &&
> + test_must_fail git -C base grep --cached --recurse-submodules C &&
...then, if replace refs are disabled in the superproject (but not the
submodule), 'b' no longer replaces 'a' but 'd' still replaces 'c'...
> +
> + git -C base/sub config core.useReplaceRefs false &&
> + git -C base grep --cached --recurse-submodules A &&
> + git -C base grep --cached --recurse-submodules C &&
...but once replace refs are disabled in the submodule, 'd' no longer
replaces 'c', and 'b' still doesn't replace 'a'...
> +
> + git -C base config --unset core.useReplaceRefs &&
> + test_must_fail git -C base grep --cached --recurse-submodules A &&
> + git -C base grep --cached --recurse-submodules C
...and, finally, if we restore the default state in the superproject
(replace refs enabled) but not the submodule, 'b' once again replaces 'a',
but 'd' still doesn't replace 'c'.
Thanks for adding this test! It clearly and thoroughly exercises the updated
config behavior.
> +'
> +
> test_done
next prev parent reply other threads:[~2023-06-05 19:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 18:43 [PATCH 0/3] Create stronger guard rails on replace refs Derrick Stolee via GitGitGadget
2023-05-26 18:43 ` [PATCH 1/3] repository: create disable_replace_refs() Derrick Stolee via GitGitGadget
2023-05-31 4:41 ` Elijah Newren
2023-05-31 13:37 ` Derrick Stolee
2023-06-01 17:47 ` Jeff King
2023-06-03 0:28 ` Junio C Hamano
2023-06-04 6:32 ` Jeff King
2023-06-01 5:23 ` Junio C Hamano
2023-06-01 16:35 ` Victoria Dye
2023-05-26 18:43 ` [PATCH 2/3] replace-objects: create wrapper around setting Derrick Stolee via GitGitGadget
2023-06-01 16:35 ` Victoria Dye
2023-06-01 19:50 ` Derrick Stolee
2023-06-03 1:47 ` Elijah Newren
2023-06-05 15:44 ` Derrick Stolee
2023-05-26 18:43 ` [PATCH 3/3] repository: create read_replace_refs setting Derrick Stolee via GitGitGadget
2023-06-01 16:36 ` Victoria Dye
2023-06-01 19:52 ` Derrick Stolee
2023-05-31 5:11 ` [PATCH 0/3] Create stronger guard rails on replace refs Elijah Newren
2023-06-02 14:29 ` [PATCH v2 " Derrick Stolee via GitGitGadget
2023-06-02 14:29 ` [PATCH v2 1/3] repository: create disable_replace_refs() Derrick Stolee via GitGitGadget
2023-06-02 14:29 ` [PATCH v2 2/3] replace-objects: create wrapper around setting Derrick Stolee via GitGitGadget
2023-06-03 6:22 ` René Scharfe
2023-06-05 13:22 ` Derrick Stolee
2023-06-02 14:29 ` [PATCH v2 3/3] repository: create read_replace_refs setting Derrick Stolee via GitGitGadget
2023-06-05 19:32 ` Victoria Dye [this message]
2023-06-03 1:52 ` [PATCH v2 0/3] Create stronger guard rails on replace refs Elijah Newren
2023-06-06 13:24 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2023-06-06 13:24 ` [PATCH v3 1/3] repository: create disable_replace_refs() Derrick Stolee via GitGitGadget
2023-06-06 13:24 ` [PATCH v3 2/3] replace-objects: create wrapper around setting Derrick Stolee via GitGitGadget
2023-06-06 13:24 ` [PATCH v3 3/3] repository: create read_replace_refs setting Derrick Stolee via GitGitGadget
2023-06-06 16:15 ` [PATCH v3 0/3] Create stronger guard rails on replace refs Victoria Dye
2023-06-12 20:45 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f8094f2d-fbf7-3379-a630-781eb09cce64@github.com \
--to=vdye@github.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).