Skip to content

Commit dcacb1b

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Reviewed-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent df617b5 commit dcacb1b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

builtin/merge.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ static void finish(struct commit *head_commit,
404404
* We ignore errors in 'gc --auto', since the
405405
* user should see them.
406406
*/
407+
close_all_packs();
407408
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
408409
}
409410
}

0 commit comments

Comments
 (0)