proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 05:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refs: fix git_reference_rename()

Browse Source 
reference_rename() recently failed when renaming an existing reference
refs/heads/foo/bar -> refs/heads/foo because of a change in the
underlying functions / error codes. Fixes #412.

Signed-off-by: schu <schu-github@schulog.org>
This commit is contained in:
schu 2011-09-20 11:11:59 +02:00
parent b4ec3c648f
commit 93fdbe000c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/refs.c
View File

@ -1287,8 +1287,13 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
error = git_reference_delete(new_ref);
}
if (error < GIT_SUCCESS && error != GIT_ENOTFOUND)
if (error < GIT_SUCCESS) {
git_path_join(aux_path, ref->owner->path_repository, new_name);
/* If we couldn't read the reference because it doesn't
* exist it's ok - otherwise return */
if (git_futils_isfile(aux_path) == GIT_SUCCESS)
goto cleanup;
}
if ((error = reference_available(ref->owner, new_name, ref->name)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to rename reference. Reference already exists");
@ -1328,9 +1333,7 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
git_hashtable_remove(ref->owner->references.loose_cache, old_name);
}
/* build new path */
git_path_join(aux_path, ref->owner->path_repository, new_name);
if (git_futils_exists(aux_path) == GIT_SUCCESS) {
if (git_futils_isdir(aux_path) == GIT_SUCCESS) {
if ((error = git_futils_rmdir_r(aux_path, 0)) < GIT_SUCCESS)