Returning error if dereferencing operation fails.

This commit is contained in:
Ben Straub 2012-04-27 13:53:28 -07:00
parent 387d01b857
commit 7149a6252c
2 changed files with 6 additions and 1 deletions

View File

@ -174,6 +174,10 @@ static int dereference_to_type(git_object **out, git_object *obj, git_otype targ
/* Dereference once, if possible. */
obj2 = dereference_object(obj1);
if (!obj2) {
giterr_set(GITERR_REFERENCE, "Can't dereference to type");
return GIT_ERROR;
}
if (obj1 != obj) {
git_object_free(obj1);
}
@ -226,7 +230,6 @@ static int handle_caret_syntax(git_object **out, git_object *obj, const char *mo
/* {...} -> Dereference until we reach an object of a certain type. */
if (dereference_to_type(out, obj, parse_obj_type(movement)) < 0) {
giterr_set(GITERR_REFERENCE, "Can't dereference to type");
return GIT_ERROR;
}
return 0;

View File

@ -105,6 +105,8 @@ void test_refs_revparse__to_type(void)
oid_str_cmp(g_obj, "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "point_to_blob^{blob}"));
oid_str_cmp(g_obj, "1385f264afb75a56a5bec74243be9b367ba4ca08");
cl_git_fail(git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
}
void test_refs_revparse__reflog(void)