]> git.ipfire.org Git - thirdparty/git.git/commit - object-file.c
prune: close directory earlier during loose-object directory traversal
authorJohannes Sixt <j6t@kdbg.org>
Wed, 12 Aug 2015 17:43:01 +0000 (19:43 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2015 19:06:00 +0000 (12:06 -0700)
commit094c7e635287e999f382681b0749ce7711e5ce7d
tree3e74cf999d5cd4f863c62d5527ee77810cb266e2
parentee1c6c34ac64c1e10b17a50710ea7002b7e7241f
prune: close directory earlier during loose-object directory traversal

27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16)
introduced a new function for_each_loose_file_in_objdir() with a helper
for_each_file_in_obj_subdir(). The latter calls callbacks for each file
found during a directory traversal and finally also a callback for the
directory itself.

git-prune uses the function to clean up the object directory. In
particular, in the directory callback it calls rmdir(). On Windows XP,
this rmdir call fails, because the directory is still open while the
callback is called. Close the directory before calling the callback.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1_file.c