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 /git.c | |
| parent | Merge branch 'rs/fetch-pack-invalid-lockfile' (diff) | |
| parent | t7900: fix typo: "test_execpt_success" (diff) | |
| download | git-f2a75cb312d775c51c2029bcce227e3ea078c5f8.tar.gz git-f2a75cb312d775c51c2029bcce227e3ea078c5f8.zip | |
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 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -535,7 +535,7 @@ static struct cmd_struct commands[] = { { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "mailsplit", cmd_mailsplit, NO_PARSEOPT }, - { "maintenance", cmd_maintenance, RUN_SETUP_GENTLY | NO_PARSEOPT }, + { "maintenance", cmd_maintenance, RUN_SETUP | NO_PARSEOPT }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "merge-base", cmd_merge_base, RUN_SETUP }, { "merge-file", cmd_merge_file, RUN_SETUP_GENTLY }, |