diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:13 -0800 |
| commit | f748e6916749e35fc54c24eb6e02e1182c62a052 (patch) | |
| tree | 48c857eefa9b5c985feab4fcbcd38ed26c16a2fd /builtin/merge.c | |
| parent | b11a3badf2353d69a244348991ff35f823f6b967 (diff) | |
| parent | d5621020c1e0edfa998cb5c5e80cdf47f36ffb1a (diff) | |
Merge branch 'js/close-packs-before-gc' into maint
Many codepaths that run "gc --auto" before exiting kept packfiles
mapped and left the file descriptors to them open, which was not
friendly to systems that cannot remove files that are open. They
now close the packs before doing so.
* js/close-packs-before-gc:
receive-pack: release pack files before garbage-collecting
merge: release pack files before garbage-collecting
am: release pack files before garbage-collecting
fetch: release pack files before garbage-collecting
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 15bf95b3ac..b98a3489bf 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -404,6 +404,7 @@ static void finish(struct commit *head_commit, * We ignore errors in 'gc --auto', since the * user should see them. */ + close_all_packs(); run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); } } |