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>
Johannes Schindelin committed
Jan 13, 2016 at 18:20 UTC
dcacb1b2ee42d3cc20e4720134f18ab5ba267f3a
1 file changed
+1
builtin/merge.c
+1
@@ -404,6 +404,7 @@ static void finish(struct commit *head_commit,
404
* We ignore errors in 'gc --auto', since the
405
* user should see them.
406
*/
407
+ close_all_packs();
408
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
409
}
410
}