diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:38 (GMT) |
| commit | 48794acc50f14394ca6c4f5092a4a498f409f350 (patch) | |
| tree | 8e3a6130340ff7a54fc8c99443501ba2ec1453c1 /builtin/merge.c | |
| parent | e1cfff676549cdcd702cbac105468723ef2722f4 (diff) | |
| parent | 25914c4fdeefd99b06e134496dfb9bbb58a5c417 (diff) | |
| download | git-48794acc50f14394ca6c4f5092a4a498f409f350.zip git-48794acc50f14394ca6c4f5092a4a498f409f350.tar.gz git-48794acc50f14394ca6c4f5092a4a498f409f350.tar.bz2 | |
Merge branch 'ds/maintenance-part-1'
A "git gc"'s big brother has been introduced to take care of more
repository maintenance tasks, not limited to the object database
cleaning.
* ds/maintenance-part-1:
maintenance: add trace2 regions for task execution
maintenance: add auto condition for commit-graph task
maintenance: use pointers to check --auto
maintenance: create maintenance.<task>.enabled config
maintenance: take a lock on the objects directory
maintenance: add --task option
maintenance: add commit-graph task
maintenance: initialize task array
maintenance: replace run_auto_gc()
maintenance: add --quiet option
maintenance: create basic maintenance runner
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 032a8f5..9d5359e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -456,7 +456,7 @@ static void finish(struct commit *head_commit, * user should see them. */ close_object_store(the_repository->objects); - run_auto_gc(verbosity < 0); + run_auto_maintenance(verbosity < 0); } } if (new_head && show_diffstat) { |