Returning error if dereferencing operation fails.

ben · Apr 27, 2012 · 048debe · 048debe
1 parent d98fa70
commit 048debe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/revparse.c b/src/revparse.c
@@ -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;

diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
@@ -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)