Skip to content

Commit c1aa08f

Browse files
j6tdscho
authored andcommitted
prune: close directory earlier during loose-object directory traversal
27e1e22 (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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4ded373 commit c1aa08f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sha1_file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3518,12 +3518,12 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
35183518
break;
35193519
}
35203520
}
3521-
strbuf_setlen(path, baselen);
3521+
closedir(dir);
35223522

3523+
strbuf_setlen(path, baselen);
35233524
if (!r && subdir_cb)
35243525
r = subdir_cb(subdir_nr, path->buf, data);
35253526

3526-
closedir(dir);
35273527
return r;
35283528
}
35293529

0 commit comments

Comments
 (0)