initRepoAtomically: Catch directory_not_empty

This commit is contained in:
Robert Hensing 2024-11-06 23:52:48 +01:00
parent 619eeb658a
commit 388271e8ec

View file

@ -217,8 +217,12 @@ static void initRepoAtomically(std::filesystem::path &path, bool bare) {
try { try {
std::filesystem::rename(tmpDir, path); std::filesystem::rename(tmpDir, path);
} catch (std::filesystem::filesystem_error & e) { } 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; return;
}
else else
throw SysError("moving temporary git repository from %s to %s", tmpDir, path); throw SysError("moving temporary git repository from %s to %s", tmpDir, path);
} }