Merge pull request #11821 from hercules-ci/issue-11815

initRepoAtomically: Catch directory_not_empty
This commit is contained in:
Jörg Thalheim 2024-11-07 07:22:23 +01:00 committed by GitHub
commit 8f553f6eef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -217,8 +217,12 @@ static void initRepoAtomically(std::filesystem::path &path, bool bare) {
try {
std::filesystem::rename(tmpDir, path);
} catch (std::filesystem::filesystem_error & e) {
if (e.code() == std::errc::file_exists) // Someone might race us to create the repository.
// Someone may race us to create the repository.
if (e.code() == std::errc::file_exists
// `path` may be attempted to be deleted by s::f::rename, in which case the code is:
|| e.code() == std::errc::directory_not_empty) {
return;
}
else
throw SysError("moving temporary git repository from %s to %s", tmpDir, path);
}