I noticed this while we were updating the microsoft/git fork to include v2.38.0-rc0. I don't think 'git maintenance unregister' was idempotent before, but instead some change in 'scalar unregister' led to it relying on the return code of 'git maintenance unregister'. Our functional tests expect 'scalar unregister' to be idempotent, and I think that's a good pattern for 'git maintenance unregister', so I'm fixing it at that layer. Despite finding this during the 2.38.0-rc0 integration, this isn't critical to the release. Perhaps an argument could be made that "failure means it wasn't registered before", but I think that isn't terribly helpful. Our functional tests are running the unregister subcommand to disable maintenance in order to run tests on the object store (such as running maintenance commands in the foreground and checking the object store afterwards). This is a form of automation using 'unregister' as a check that maintenance will not run at the same time, and it doesn't care if maintenance was already disabled. I can imagine other scripting scenarios wanting that kind of guarantee. Updates in v4 ============= * The previous version would segfault if 'git maintenance unregister' was called with an empty 'maintenance.repo' config list. This scenario is fixed and tested. * Part of the issue is that for_each_string_list_item() cannot handle a NULL value. The macro can't be made smarter without failing -Werror=address issues, so for now I added a patch that adds a warning to its doc comment. Updates in v3 ============= * The --force option now uses OPT_FORCE and is hidden from autocomplete. * A new commit is added that removes the use of Git subprocesses in favor of git_config_set_multivar_in_file_gently(). Updates in v2 ============= * This is now a two-patch series. * I rebased onto v2.38.0-rc1 for two reasons: Scalar is now merged, and the usage for 'git maintenance unregister' removed its translation markers. * Instead of making git maintenance unregister idempotent, add a --force option for those who do not want to require that the repository is already registered. * Make scalar unregister idempotent, with reasons argued in patch 2. Thanks, -Stolee Derrick Stolee (4): maintenance: add 'unregister --force' scalar: make 'unregister' idempotent gc: replace config subprocesses with API calls string-list: document iterator behavior on NULL input Documentation/git-maintenance.txt | 6 +- builtin/gc.c | 98 +++++++++++++++++++++---------- scalar.c | 5 +- string-list.h | 7 ++- t/t7900-maintenance.sh | 11 +++- t/t9210-scalar.sh | 5 +- 6 files changed, 96 insertions(+), 36 deletions(-) base-commit: 1b3d6e17fe83eb6f79ffbac2f2c61bbf1eaef5f8 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1358%2Fderrickstolee%2Fmaintenance-unregister-v4 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1358/derrickstolee/maintenance-unregister-v4 Pull-Request: https://github.com/gitgitgadget/git/pull/1358 Range-diff vs v3: 1: 8a8bffaec89 ! 1: c3301e21109 maintenance: add 'unregister --force' @@ Commit message '--force' option that will siltently succeed if the repository is not already registered. + Also add an extra test of 'git maintenance unregister' at a point where + there are no registered repositories. This should fail without --force. + Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx> ## Documentation/git-maintenance.txt ## @@ builtin/gc.c: done: char *maintpath = get_maintpath(); + int found = 0; + struct string_list_item *item; -+ const struct string_list *list = git_config_get_value_multi(key); ++ const struct string_list *list; argc = parse_options(argc, argv, prefix, options, builtin_maintenance_unregister_usage, 0); @@ builtin/gc.c: static int maintenance_unregister(int argc, const char **argv, con - config_unset.git_cmd = 1; - strvec_pushl(&config_unset.args, "config", "--global", "--unset", - "--fixed-value", "maintenance.repo", maintpath, NULL); -+ for_each_string_list_item(item, list) { -+ if (!strcmp(maintpath, item->string)) { -+ found = 1; -+ break; ++ list = git_config_get_value_multi(key); ++ if (list) { ++ for_each_string_list_item(item, list) { ++ if (!strcmp(maintpath, item->string)) { ++ found = 1; ++ break; ++ } + } + } + @@ builtin/gc.c: static int maintenance_unregister(int argc, const char **argv, con } ## t/t7900-maintenance.sh ## +@@ t/t7900-maintenance.sh: test_expect_success 'maintenance.strategy inheritance' ' + + test_expect_success 'register and unregister' ' + test_when_finished git config --global --unset-all maintenance.repo && ++ ++ test_must_fail git maintenance unregister 2>err && ++ grep "is not registered" err && ++ git maintenance unregister --force && ++ + git config --global --add maintenance.repo /existing1 && + git config --global --add maintenance.repo /existing2 && + git config --global --get-all maintenance.repo >before && @@ t/t7900-maintenance.sh: test_expect_success 'register and unregister' ' git maintenance unregister && 2: 06d5ef3fc57 = 2: a768c326c0f scalar: make 'unregister' idempotent 3: 260d7bee36e = 3: 5aa9cc1d6b9 gc: replace config subprocesses with API calls -: ----------- > 4: 73a262cdca4 string-list: document iterator behavior on NULL input -- gitgitgadget
