Merge pull request #4026 from libgit2/cmn/refdb-fs-errors

refdb: bubble up recursive rm when locking a ref
This commit is contained in:
Carlos Martín Nieto 2016-12-19 17:28:41 +00:00 committed by GitHub
commit 3714c13a88

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
* which name would collide with the reference name
*/
if (git_futils_rmdir_r(name, backend->path, GIT_RMDIR_SKIP_NONEMPTY) < 0)
return -1;
if ((error = git_futils_rmdir_r(name, backend->path, GIT_RMDIR_SKIP_NONEMPTY)) < 0)
return error;
if (git_buf_joinpath(&ref_path, backend->path, name) < 0)
return -1;