From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 13 Jan 2016 17:20:21 +0000 (+0100)
Subject: merge: release pack files before garbage-collecting
X-Git-Tag: v2.7.1~18^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcacb1b2ee42d3cc20e4720134f18ab5ba267f3a;p=git

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>
---

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);
 		}
 	}