summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2019-05-17 11:41:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-12 11:33:54 -0700
commit2d511cfc0bfe1d2b98ba8b272ddd9ba83e84e5f8 (patch)
tree1bf0a1bf940a3c1a4db47c88a23fbf8b3bb7a080 /builtin/merge.c
parentpackfile: close commit-graph in close_all_packs (diff)
downloadtgif-2d511cfc0bfe1d2b98ba8b272ddd9ba83e84e5f8.tar.xz
packfile: rename close_all_packs to close_object_store
The close_all_packs() method is now responsible for more than just pack-files. It also closes the commit-graph and the multi-pack-index. Rename the function to be more descriptive of its larger role. The name also fits because the input parameter is a raw_object_store. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e47d77baee..72d7a7c909 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -449,7 +449,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);
}
}