From: Michael Haggerty Date: Sat, 18 Jan 2014 22:49:01 +0000 (+0100) Subject: rename_tmp_log(): on SCLD_VANISHED, retry X-Git-Tag: v1.9-rc1~10^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/08f555cb82f92797ca0aa0d6ba32e6872f1331e5 rename_tmp_log(): on SCLD_VANISHED, retry If safe_create_leading_directories() fails because a file along the path unexpectedly vanished, try again from the beginning. Try at most 4 times. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/refs.c b/refs.c index fd644f0f41..703b5a2f45 100644 --- a/refs.c +++ b/refs.c @@ -2533,7 +2533,14 @@ static int rename_tmp_log(const char *newrefname) int attempts_remaining = 4; retry: - if (safe_create_leading_directories(git_path("logs/%s", newrefname))) { + switch (safe_create_leading_directories(git_path("logs/%s", newrefname))) { + case SCLD_OK: + break; /* success */ + case SCLD_VANISHED: + if (--attempts_remaining > 0) + goto retry; + /* fall through */ + default: error("unable to create directory for %s", newrefname); return -1; }