fast-import: close pack before unlinking it
This is sort of a companion patch to 4723ee9(Close files opened by lock_file() before unlinking.): on Windows, you cannot delete what is still open. This makes test 9300-fast-import pass on Windows for me; quite a few fast-imports leave temporary packs until the test "blank lines not necessary after other commands" actually tests for the number of files in .git/objects/pack/, which has a few temporary packs now. I guess that 8b4eb6b(Do not perform cross-directory renames when creating packs) was "responsible" for the breakage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Dec 15, 2008 at 22:11 UTC
87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d
1 file changed
+3
-1
fast-import.c
+3
-1
@@ -982,8 +982,10 @@ static void end_packfile(void)
982
983
pack_id++;
984
}
985
- else
985
+ else {
986
+ close(old_p->pack_fd);
987
unlink(old_p->pack_name);
988
+ }
989
free(old_p);
990
991
/* We can't carry a delta across packfiles. */