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>
This commit is contained in:
parent
a8335024c2
commit
87c8a56e4f
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user