summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-01-13 17:20:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-13 19:36:28 (GMT)
commitdcacb1b2ee42d3cc20e4720134f18ab5ba267f3a (patch)
tree7ff2833467acbd0a4c65bc075a9e93da2ef0360a /builtin/merge.c
parentdf617b529e9ebf01cde572b8f78f4dd8bc6c010b (diff)
downloadgit-dcacb1b2ee42d3cc20e4720134f18ab5ba267f3a.zip
git-dcacb1b2ee42d3cc20e4720134f18ab5ba267f3a.tar.gz
git-dcacb1b2ee42d3cc20e4720134f18ab5ba267f3a.tar.bz2
merge: release pack files before garbage-collecting
Before auto-gc'ing, we need to make sure that the pack files are released in case they need to be repacked and garbage-collected. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 15bf95b..b98a348 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);
}
}