Commit 7149a625 by Ben Straub

Returning error if dereferencing operation fails.

parent 387d01b8
...@@ -174,6 +174,10 @@ static int dereference_to_type(git_object **out, git_object *obj, git_otype targ ...@@ -174,6 +174,10 @@ static int dereference_to_type(git_object **out, git_object *obj, git_otype targ
/* Dereference once, if possible. */ /* Dereference once, if possible. */
obj2 = dereference_object(obj1); obj2 = dereference_object(obj1);
if (!obj2) {
giterr_set(GITERR_REFERENCE, "Can't dereference to type");
return GIT_ERROR;
}
if (obj1 != obj) { if (obj1 != obj) {
git_object_free(obj1); git_object_free(obj1);
} }
...@@ -226,7 +230,6 @@ static int handle_caret_syntax(git_object **out, git_object *obj, const char *mo ...@@ -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. */ /* {...} -> Dereference until we reach an object of a certain type. */
if (dereference_to_type(out, obj, parse_obj_type(movement)) < 0) { if (dereference_to_type(out, obj, parse_obj_type(movement)) < 0) {
giterr_set(GITERR_REFERENCE, "Can't dereference to type");
return GIT_ERROR; return GIT_ERROR;
} }
return 0; return 0;
......
...@@ -105,6 +105,8 @@ void test_refs_revparse__to_type(void) ...@@ -105,6 +105,8 @@ void test_refs_revparse__to_type(void)
oid_str_cmp(g_obj, "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"); oid_str_cmp(g_obj, "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "point_to_blob^{blob}")); cl_git_pass(git_revparse_single(&g_obj, g_repo, "point_to_blob^{blob}"));
oid_str_cmp(g_obj, "1385f264afb75a56a5bec74243be9b367ba4ca08"); 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) void test_refs_revparse__reflog(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment