diff options
author | Vicent Marti <vicent@github.com> | 2014-04-04 14:23:07 +0200 |
---|---|---|
committer | Vicent Marti <vicent@github.com> | 2014-04-04 14:23:07 +0200 |
commit | f34408a7b440489e474f5a5f8d90167b7d8195e9 (patch) | |
tree | 3bc02491aabb7b5d8263092709b98de6305db664 | |
parent | 4c219cf64868d1b3fc2c5df0bbf803b40c6e4cef (diff) | |
parent | 2873a862fd1899909424b60b44fa0680851a60f6 (diff) | |
download | libgit2-f34408a7b440489e474f5a5f8d90167b7d8195e9.tar.gz |
Merge pull request #2211 from Yogu/retry-renaming-config
Retry committing locked files on error
-rw-r--r-- | src/win32/posix_w32.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c index 18f717b0f..6f2931880 100644 --- a/src/win32/posix_w32.c +++ b/src/win32/posix_w32.c @@ -467,10 +467,31 @@ int p_rename(const char *from, const char *to) { git_win32_path wfrom; git_win32_path wto; + int rename_tries; + int rename_succeeded; + int error; git_win32_path_from_c(wfrom, from); git_win32_path_from_c(wto, to); - return MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) ? 0 : -1; + + /* wait up to 50ms if file is locked by another thread or process */ + rename_tries = 0; + rename_succeeded = 0; + while (rename_tries < 10) { + if (MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) { + rename_succeeded = 1; + break; + } + + error = GetLastError(); + if (error == ERROR_SHARING_VIOLATION || error == ERROR_ACCESS_DENIED) { + Sleep(5); + rename_tries++; + } else + break; + } + + return rename_succeeded ? 0 : -1; } int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags) |