proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-27 06:12:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Raise GIT_EEXISTS in case of conflicting ref names instead of passing

Browse Source 
the error returned by the subsystem; clarify error message.

Fix tiny typo.

Signed-off-by: schu <schu-github@schulog.org>
This commit is contained in:
schu 2011-06-05 20:47:30 +02:00
parent 1b6d8163ce
commit 76b15cb18a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/refs.c
View File

@ -1084,7 +1084,7 @@ static int reference_available(git_repository *repo, const char *ref, const char
git_vector_free(&refs);
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Reference `%s` already exists", ref);
return error == GIT_SUCCESS ? GIT_SUCCESS : git__throw(GIT_EEXISTS, "Reference name `%s` conflicts with existing reference", ref);
}
/*
@ -1124,7 +1124,7 @@ static int reference_rename(git_reference *ref, const char *new_name, int force)
error != GIT_ENOTFOUND)
return git__rethrow(error, "Failed to rename reference");
if ((error == reference_available(ref->owner, new_name, ref->name)) < GIT_SUCCESS)
if ((error = reference_available(ref->owner, new_name, ref->name)) < GIT_SUCCESS)
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to rename reference. Reference already exists");
old_name = ref->name;