summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-12-08 15:11:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-08 15:11:19 -0800
commitd702cb9e890d09c4aa82eadaa9282feca95000e9 (patch)
tree95473c0203567b8e0e512165895540d92baeaf57 /builtin/gc.c
parentMerge branch 'ds/config-literal-value' (diff)
parentmaintenance: use 'git config --fixed-value' (diff)
downloadtgif-d702cb9e890d09c4aa82eadaa9282feca95000e9.tar.xz
Merge branch 'ds/maintenance-part-3'
"git maintenance" command had trouble working in a directory whose pathname contained an ERE metacharacter like '+'. * ds/maintenance-part-3: maintenance: use 'git config --fixed-value'
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 3e8d76fd5a..592b20fb89 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -1460,7 +1460,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);
@@ -1491,7 +1492,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);