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 /builtin/pull.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 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index b311ea6..cf6c56e 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -26,6 +26,7 @@ #include "wt-status.h" #include "commit-reach.h" #include "sequencer.h" +#include "packfile.h" /** * Parses the value of --rebase. If value is a false value, returns @@ -577,7 +578,7 @@ static int run_fetch(const char *repo, const char **refspecs) strvec_pushv(&args, refspecs); } else if (*refspecs) BUG("refspecs without repo?"); - ret = run_command_v_opt(args.v, RUN_GIT_CMD); + ret = run_command_v_opt(args.v, RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE); strvec_clear(&args); return ret; } |