refdb: bubble up recursive rm when locking a ref

Failure to bubble up this error means some locking errors do not get reported as
such on Windows.
This commit is contained in:
Carlos Martín Nieto 2016-12-11 17:56:38 +00:00
parent c5e6ba2892
commit 6ab65b80b4

View File

@ -729,8 +729,8 @@ static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char *
/* Remove a possibly existing empty directory hierarchy /* Remove a possibly existing empty directory hierarchy
* which name would collide with the reference name * which name would collide with the reference name
*/ */
if (git_futils_rmdir_r(name, backend->path, GIT_RMDIR_SKIP_NONEMPTY) < 0) if ((error = git_futils_rmdir_r(name, backend->path, GIT_RMDIR_SKIP_NONEMPTY)) < 0)
return -1; return error;
if (git_buf_joinpath(&ref_path, backend->path, name) < 0) if (git_buf_joinpath(&ref_path, backend->path, name) < 0)
return -1; return -1;