[PATCH 3/4] merge: release pack files before garbage-collecting
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 13, 2016, 17:20 UTC
- Message-ID
- <83f7c1a7ad4f2d63733b61115b4a1dd88468e96f.1452705584.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1452705584.git.johannes.schindelin@gmx.de>
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> --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+)
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); } }
-- 2.6.3.windows.1.300.g1c25e49