Skip to content

Commit f858f1f

Browse files
jeffhostetlerdscho
authored andcommitted
mingw: improve performance of mingw_unlink()
Update mingw_unlink() to first try to delete the file with existing permissions before trying to force it. Windows throws an error when trying to delete a read-only file. The mingw_unlink() compatibility wrapper always tries to _wchmod(666) the file before calling _wunlink() to avoid that error. However, since most files in the worktree are already writable, this is usually wasted effort. Update mingw_unlink() to just call DeleteFileW() directly and if that succeeds return. If that fails, fall back into the existing code path to update the permissions and use _wunlink() to get the existing error code mapping. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent c8f9f13 commit f858f1f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

compat/mingw.c

+3
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ int mingw_unlink(const char *pathname)
290290
if (xutftowcs_path(wpathname, pathname) < 0)
291291
return -1;
292292

293+
if (DeleteFileW(wpathname))
294+
return 0;
295+
293296
/* read-only files cannot be removed */
294297
_wchmod(wpathname, 0666);
295298
while ((ret = _wunlink(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) {

0 commit comments

Comments
 (0)