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 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 (2): maintenance: add 'unregister --force' scalar: make 'unregister' idempotent Documentation/git-maintenance.txt | 6 +++++- builtin/gc.c | 31 +++++++++++++++++++++++++------ scalar.c | 5 ++++- t/t7900-maintenance.sh | 6 +++++- t/t9210-scalar.sh | 5 ++++- 5 files changed, 43 insertions(+), 10 deletions(-) base-commit: 1b3d6e17fe83eb6f79ffbac2f2c61bbf1eaef5f8 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1358%2Fderrickstolee%2Fmaintenance-unregister-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1358/derrickstolee/maintenance-unregister-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/1358 Range-diff vs v1: 1: f028208a3ab ! 1: 69c74f52eef maintenance: make unregister idempotent @@ Metadata Author: Derrick Stolee <derrickstolee@xxxxxxxxxx> ## Commit message ## - maintenance: make unregister idempotent + maintenance: add 'unregister --force' The 'git maintenance unregister' subcommand has a step that removes the current repository from the multi-valued maitenance.repo config key. @@ Commit message running 'git maintenance unregister' twice result in a failure in the second instance. - Make this task idempotent, since the end result is the same in both - cases: maintenance will no longer run on this repository. + This failure exit code is helpful, but its message is not. Add a new + die() message that explicitly calls out the failure due to the + repository not being registered. + + In some cases, users may want to run 'git maintenance unregister' just + to make sure that background jobs will not start on this repository, but + they do not want to check to see if it is registered first. Add a new + '--force' option that will siltently succeed if the repository is not + already registered. Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx> + ## Documentation/git-maintenance.txt ## +@@ Documentation/git-maintenance.txt: SYNOPSIS + [verse] + 'git maintenance' run [<options>] + 'git maintenance' start [--scheduler=<scheduler>] +-'git maintenance' (stop|register|unregister) ++'git maintenance' (stop|register|unregister) [<options>] + + + DESCRIPTION +@@ Documentation/git-maintenance.txt: unregister:: + Remove the current repository from background maintenance. This + only removes the repository from the configured list. It does not + stop the background maintenance processes from running. +++ ++The `unregister` subcommand will report an error if the current repository ++is not already registered. Use the `--force` option to return success even ++when the current repository is not registered. + + TASKS + ----- + ## builtin/gc.c ## -@@ builtin/gc.c: static int maintenance_unregister(int argc, const char **argv, const char *prefi +@@ builtin/gc.c: done: + } + + static char const * const builtin_maintenance_unregister_usage[] = { +- "git maintenance unregister", ++ "git maintenance unregister [--force]", + NULL + }; + + static int maintenance_unregister(int argc, const char **argv, const char *prefix) + { ++ int force = 0; struct option options[] = { ++ OPT_BOOL(0, "force", &force, ++ N_("return success even if repository was not registered")), OPT_END(), }; - int rc; @@ builtin/gc.c: static int maintenance_unregister(int argc, const char **argv, con + "--fixed-value", key, maintpath, NULL); + + rc = run_command(&config_unset); ++ } else if (!force) { ++ die(_("repository '%s' is not registered"), maintpath); + } - rc = run_command(&config_unset); @@ t/t7900-maintenance.sh: test_expect_success 'register and unregister' ' - test_cmp before actual + test_cmp before actual && + -+ # Expect unregister to be idempotent. -+ git maintenance unregister ++ test_must_fail git maintenance unregister 2>err && ++ grep "is not registered" err && ++ git maintenance unregister --force ' test_expect_success !MINGW 'register and unregister with regex metacharacters' ' -: ----------- > 2: f5d8d6e4901 scalar: make 'unregister' idempotent -- gitgitgadget
