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

Report a couple object error conditions

Browse Source
This commit is contained in:
Russell Belfer 2013-05-01 14:23:01 -07:00
parent 734c6fc134
commit 8915a140cb
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/object.c
View File

@ -122,8 +122,10 @@ int git_object_lookup_prefix(
assert(repo && object_out && id); assert(repo && object_out && id);
if (len < GIT_OID_MINPREFIXLEN) if (len < GIT_OID_MINPREFIXLEN) {
giterr_set(GITERR_OBJECT, "Ambiguous lookup - OID prefix is too short");
return GIT_EAMBIGUOUS; return GIT_EAMBIGUOUS;
}
error = git_repository_odb__weakptr(&odb, repo); error = git_repository_odb__weakptr(&odb, repo);
if (error < 0) if (error < 0)
@ -311,18 +313,22 @@ int git_object_peel(
git_object *source, *deref = NULL; git_object *source, *deref = NULL;
int error; int error;
if (target_type != GIT_OBJ_TAG &&
target_type != GIT_OBJ_COMMIT &&
target_type != GIT_OBJ_TREE &&
target_type != GIT_OBJ_BLOB &&
target_type != GIT_OBJ_ANY)
return GIT_EINVALIDSPEC;
assert(object && peeled); assert(object && peeled);
if (git_object_type(object) == target_type) if (git_object_type(object) == target_type)
return git_object_dup(peeled, (git_object *)object); return git_object_dup(peeled, (git_object *)object);
if (target_type != GIT_OBJ_TAG &&
target_type != GIT_OBJ_COMMIT &&
target_type != GIT_OBJ_TREE &&
target_type != GIT_OBJ_BLOB &&
target_type != GIT_OBJ_ANY) {
giterr_set(GITERR_OBJECT, "Cannot peel to object type %d",
(int)target_type);
return GIT_EINVALIDSPEC;
}
source = (git_object *)object; source = (git_object *)object;
while (!(error = dereference_object(&deref, source))) { while (!(error = dereference_object(&deref, source))) {