diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-09 02:11:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-09 02:11:19 +0300 |
| commit | d702cb9e890d09c4aa82eadaa9282feca95000e9 (patch) | |
| tree | 95473c0203567b8e0e512165895540d92baeaf57 | |
| parent | a10e7842abf8ec62dcd513cf74207cf2401aa2f2 (diff) | |
| parent | 483a6d9b5da6a03d34aceb7bff86b12c7241e17b (diff) | |
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'
| -rw-r--r-- | builtin/gc.c | 5 | ||||
| -rwxr-xr-x | t/t7900-maintenance.sh | 12 |
2 files changed, 15 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); diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index d9e68bb2bf..ee91a714b9 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -404,6 +404,18 @@ test_expect_success 'register and unregister' ' test_cmp before actual ' +test_expect_success !MINGW 'register and unregister with regex metacharacters' ' + META="a+b*c" && + git init "$META" && + git -C "$META" maintenance register && + git config --get-all --show-origin maintenance.repo && + git config --get-all --global --fixed-value \ + maintenance.repo "$(pwd)/$META" && + git -C "$META" maintenance unregister && + test_must_fail git config --get-all --global --fixed-value \ + maintenance.repo "$(pwd)/$META" +' + test_expect_success 'start from empty cron table' ' GIT_TEST_CRONTAB="test-tool crontab cron.txt" git maintenance start && |