summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:37 (GMT)
commit5cb7c73589059b557f0d690ed6bcfde46ef2d234 (patch)
tree1aa18e271907b69b4d49494231f8acc6f950ff4d /builtin/merge.c
parente1168940ce11878261ece4602a7d8b8ee9a8c77e (diff)
parent2d511cfc0bfe1d2b98ba8b272ddd9ba83e84e5f8 (diff)
downloadgit-5cb7c73589059b557f0d690ed6bcfde46ef2d234.zip
git-5cb7c73589059b557f0d690ed6bcfde46ef2d234.tar.gz
git-5cb7c73589059b557f0d690ed6bcfde46ef2d234.tar.bz2
Merge branch 'ds/close-object-store'
The commit-graph file is now part of the "files that the runtime may keep open file descriptors on, all of which would need to be closed when done with the object store", and the file descriptor to an existing commit-graph file now is closed before "gc" finalizes a new instance to replace it. * ds/close-object-store: packfile: rename close_all_packs to close_object_store packfile: close commit-graph in close_all_packs commit-graph: use raw_object_store when closing
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 6e99aea..aad5a95 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -453,7 +453,7 @@ static void finish(struct commit *head_commit,
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}