merge: release pack files before garbage-collecting
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 13 Jan 2016 17:20:21 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2016 19:36:28 +0000 (11:36 -0800)
commitdcacb1b2ee42d3cc20e4720134f18ab5ba267f3a
tree7ff2833467acbd0a4c65bc075a9e93da2ef0360a
parentdf617b529e9ebf01cde572b8f78f4dd8bc6c010b
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>
builtin/merge.c