summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-14 15:39:19 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-14 15:39:19 -0700
commit5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch)
treefc993f674db014236b94f3c6e147b1ac5b838699 /commit.c
parent1733832d8ec11655924af58efb67ff4503928b59 (diff)
parente5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff)
downloadgit-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.gz
Merge branch 'lt/unitype'
* lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently.
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/commit.c b/commit.c
index 6ac3bf7554..77f0ca175c 100644
--- a/commit.c
+++ b/commit.c
@@ -56,7 +56,7 @@ static struct commit *check_commit(struct object *obj,
const unsigned char *sha1,
int quiet)
{
- if (obj->type != TYPE_COMMIT) {
+ if (obj->type != OBJ_COMMIT) {
if (!quiet)
error("Object %s is a %s, not a commit",
sha1_to_hex(sha1), typename(obj->type));
@@ -86,11 +86,11 @@ struct commit *lookup_commit(const unsigned char *sha1)
if (!obj) {
struct commit *ret = alloc_commit_node();
created_object(sha1, &ret->object);
- ret->object.type = TYPE_COMMIT;
+ ret->object.type = OBJ_COMMIT;
return ret;
}
if (!obj->type)
- obj->type = TYPE_COMMIT;
+ obj->type = OBJ_COMMIT;
return check_commit(obj, sha1, 0);
}