From: Johannes Schindelin Date: Mon, 15 Dec 2008 21:11:40 +0000 (+0100) Subject: fast-import: close pack before unlinking it X-Git-Tag: v1.6.0.6~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/fast-import.c b/fast-import.c index 5473cd4d6..13b36147a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -982,8 +982,10 @@ static void end_packfile(void) pack_id++; } - else + else { + close(old_p->pack_fd); unlink(old_p->pack_name); + } free(old_p); /* We can't carry a delta across packfiles. */