diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-08 15:11:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-08 15:11:21 -0800 |
| commit | f2a75cb312d775c51c2029bcce227e3ea078c5f8 (patch) | |
| tree | 8175c13799ec06bc5487a6562e57450964e7a306 /builtin/gc.c | |
| parent | Merge branch 'rs/fetch-pack-invalid-lockfile' (diff) | |
| parent | t7900: fix typo: "test_execpt_success" (diff) | |
| download | tgif-f2a75cb312d775c51c2029bcce227e3ea078c5f8.tar.xz | |
Merge branch 'rs/maintenance-run-outside-repo'
"git maintenance run/start/stop" needed to be run in a repository
to hold the lockfile they use, but didn't make sure they are
actually in a repository, which has been corrected.
* rs/maintenance-run-outside-repo:
t7900: fix typo: "test_execpt_success"
maintenance: fix SEGFAULT when no repository
Diffstat (limited to 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 592b20fb89..b57fda4924 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1446,10 +1446,6 @@ static int maintenance_register(void) struct child_process config_set = CHILD_PROCESS_INIT; struct child_process config_get = CHILD_PROCESS_INIT; - /* There is no current repository, so skip registering it */ - if (!the_repository || !the_repository->gitdir) - return 0; - /* Disable foreground maintenance */ git_config_set("maintenance.auto", "false"); @@ -1487,9 +1483,6 @@ static int maintenance_unregister(void) { struct child_process config_unset = CHILD_PROCESS_INIT; - if (!the_repository || !the_repository->gitdir) - return error(_("no current repository to unregister")); - config_unset.git_cmd = 1; strvec_pushl(&config_unset.args, "config", "--global", "--unset", "--fixed-value", "maintenance.repo", |