add object_as_type helper for casting objects

[git/git.git] / commit.c

diff --git a/commit.c b/commit.c
index eb24add..65179f9 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -18,19 +18,6 @@ int save_commit_buffer = 1;
 
 const char *commit_type = "commit";
 
 
 const char *commit_type = "commit";
 

-static struct commit *check_commit(struct object *obj,
-                                  const unsigned char *sha1,
-                                  int quiet)
-{
-       if (obj->type != OBJ_COMMIT) {
-               if (!quiet)
-                       error("Object %s is a %s, not a commit",
-                             sha1_to_hex(sha1), typename(obj->type));
-               return NULL;
-       }
-       return (struct commit *) obj;
-}
-

 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
                                              int quiet)
 {
 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
                                              int quiet)
 {


@@ -38,7 +25,7 @@ struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
 
        if (!obj)
                return NULL;
 
        if (!obj)
                return NULL;

-       return check_commit(obj, sha1, quiet);
+       return object_as_type(obj, OBJ_COMMIT, quiet);

 }
 
 struct commit *lookup_commit_reference(const unsigned char *sha1)
 }
 
 struct commit *lookup_commit_reference(const unsigned char *sha1)


@@ -63,9 +50,7 @@ struct commit *lookup_commit(const unsigned char *sha1)
        struct object *obj = lookup_object(sha1);
        if (!obj)
                return create_object(sha1, alloc_commit_node());
        struct object *obj = lookup_object(sha1);
        if (!obj)
                return create_object(sha1, alloc_commit_node());

-       if (!obj->type)
-               obj->type = OBJ_COMMIT;
-       return check_commit(obj, sha1, 0);
+       return object_as_type(obj, OBJ_COMMIT, 0);

 }
 
 struct commit *lookup_commit_reference_by_name(const char *name)
 }
 
 struct commit *lookup_commit_reference_by_name(const char *name)