diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:45 -0700 |
| commit | c042ad5ad58d4e43aadc806850e76fef73848d2c (patch) | |
| tree | 97f9ef041f508b21da08024f5787e0e6ea30ac24 /builtin/merge.c | |
| parent | a16dd1374023d1a5f6ee7c48661e0ed53a954391 (diff) | |
| parent | c4dee2c0851f3a6b202afd2c9d979ed417f4bcdc (diff) | |
Merge branch 'js/run-command-close-packs'
The run-command API has been updated so that the callers can easily
ask the file descriptors open for packfiles to be closed immediately
before spawning commands that may trigger auto-gc.
* js/run-command-close-packs:
Close object store closer to spawning child processes
run_auto_maintenance(): implicitly close the object store
run-command: offer to close the object store before running
run-command: prettify the `RUN_COMMAND_*` flags
pull: release packs before fetching
commit-graph: when closing the graph, also release the slab
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f6d03ddf62..3fbdacc7db 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -469,7 +469,6 @@ static void finish(struct commit *head_commit, * We ignore errors in 'gc --auto', since the * user should see them. */ - close_object_store(the_repository->objects); run_auto_maintenance(verbosity < 0); } } |