diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 22:20:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 22:20:45 (GMT) |
| commit | c042ad5ad58d4e43aadc806850e76fef73848d2c (patch) | |
| tree | 97f9ef041f508b21da08024f5787e0e6ea30ac24 /run-command.c | |
| parent | a16dd1374023d1a5f6ee7c48661e0ed53a954391 (diff) | |
| parent | c4dee2c0851f3a6b202afd2c9d979ed417f4bcdc (diff) | |
| download | git-c042ad5ad58d4e43aadc806850e76fef73848d2c.zip git-c042ad5ad58d4e43aadc806850e76fef73848d2c.tar.gz git-c042ad5ad58d4e43aadc806850e76fef73848d2c.tar.bz2 | |
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 'run-command.c')
| -rw-r--r-- | run-command.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c index 3e4e082..8212456 100644 --- a/run-command.c +++ b/run-command.c @@ -8,6 +8,7 @@ #include "string-list.h" #include "quote.h" #include "config.h" +#include "packfile.h" void child_process_init(struct child_process *child) { @@ -740,6 +741,9 @@ fail_pipe: fflush(NULL); + if (cmd->close_object_store) + close_object_store(the_repository->objects); + #ifndef GIT_WINDOWS_NATIVE { int notify_pipe[2]; @@ -1042,6 +1046,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir, cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0; cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0; cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0; + cmd.close_object_store = opt & RUN_CLOSE_OBJECT_STORE ? 1 : 0; cmd.dir = dir; cmd.env = env; cmd.trace2_child_class = tr2_class; @@ -1884,6 +1889,7 @@ int run_auto_maintenance(int quiet) return 0; maint.git_cmd = 1; + maint.close_object_store = 1; strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL); strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet"); |