Re: [PATCH v2 7/7] maintenance: use 'git config --fixed-value'
- From
Emily Shaffer <emilyshaffer@google.com>
- Date
- Nov 23, 2020, 22:48 UTC
- Message-ID
- <20201123224814.GG499823@google.com>
- In-Reply-To
- <5a3acf811998bb728ce94c69611c237861775142.1606147507.git.gitgitgadget@gmail.com>
On Mon, Nov 23, 2020 at 04:05:07PM +0000, Derrick Stolee via GitGitGadget wrote:
> > > When a repository's leading directories contain regex glob characters,
Minor "well, actually" - I'm not sure 'glob' is the right word to use here.
> the config calls for 'git maintenance register' and 'git maintenance > unregister' are not careful enough. Use the new --fixed-value option > to direct the config machinery to use exact string matches. This is a > more robust option than excaping these arguments in a piecemeal fashion.
Typo on 'escaping'.
Show 48 quoted lines
>
> For the test, require that we are not running on Windows since the '+'
> character is not allowed on that filesystem.
>
> Reported-by: Emily Shaffer <emilyshaffer@google.com>
> Reported-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> ---
> builtin/gc.c | 5 +++--
> t/t7900-maintenance.sh | 12 ++++++++++++
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/gc.c b/builtin/gc.c
> index e3098ef6a1..6dde3ce1bb 100644
> --- a/builtin/gc.c
> +++ b/builtin/gc.c
> @@ -1452,7 +1452,8 @@ static int maintenance_register(void)
> git_config_set("maintenance.strategy", "incremental");
>
> config_get.git_cmd = 1;
> - strvec_pushl(&config_get.args, "config", "--global", "--get", "maintenance.repo",
> + strvec_pushl(&config_get.args, "config", "--global", "--get",
> + "--fixed-value", "maintenance.repo",
> the_repository->worktree ? the_repository->worktree
> : the_repository->gitdir,
> NULL);
> @@ -1483,7 +1484,7 @@ static int maintenance_unregister(void)
>
> config_unset.git_cmd = 1;
> strvec_pushl(&config_unset.args, "config", "--global", "--unset",
> - "maintenance.repo",
> + "--fixed-value", "maintenance.repo",
> the_repository->worktree ? the_repository->worktree
> : the_repository->gitdir,
> NULL);
> diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
> index 20184e96e1..c4e5564c31 100755
> --- a/t/t7900-maintenance.sh
> +++ b/t/t7900-maintenance.sh
> @@ -367,6 +367,18 @@ test_expect_success 'register and unregister' '
> test_cmp before actual
> '
>
> +test_expect_success !MINGW 'register and unregister with glob characters' '
> + GLOB="a+b*c" &&
> + git init "$GLOB" &&
> + git -C "$GLOB" maintenance register &&
> + git config --get-all --show-origin maintenance.repo &&Hm, what's the reason for --show-origin when the output isn't captured or checked? Is this leftover?
Show 10 quoted lines
> + git config --get-all --global --fixed-value \ > + maintenance.repo "$(pwd)/$GLOB" && > + git -C "$GLOB" maintenance unregister && > + test_must_fail git config --get-all --global --fixed-value \ > + maintenance.repo "$(pwd)/$GLOB" > +' > + > test_expect_success 'start from empty cron table' ' > GIT_TEST_CRONTAB="test-tool crontab cron.txt" git maintenance start && >
And after all that buildup, this patch is a very straightforward test fix: explain the problem, add the arg in question, add a regression test. Thanks.
Other than the one extraneous(?) line, Reviewed-by: Emily Shaffer <emilyshaffer@google.com>