diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-13 23:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-13 23:38:40 -0700 |
| commit | bf6d324e7333f62f6aee56ebb886e82e1f49e1ce (patch) | |
| tree | 946411bff17166b4d30cc7cfec4b8583a05382a7 /commit.c | |
| parent | recur vs recursive: help testing without touching too many stuff. (diff) | |
| parent | builtin-prune.c: forgot TYPE => OBJ changes. (diff) | |
| download | tgif-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.tar.xz | |
Merge branch 'lt/unitype' into js/c-merge-recursive
* 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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); } |