diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-14 15:39:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-14 15:39:19 -0700 |
| commit | 5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch) | |
| tree | fc993f674db014236b94f3c6e147b1ac5b838699 /fsck-objects.c | |
| parent | 1733832d8ec11655924af58efb67ff4503928b59 (diff) | |
| parent | e5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff) | |
| download | git-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 'fsck-objects.c')
| -rw-r--r-- | fsck-objects.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fsck-objects.c b/fsck-objects.c index ef54a8a411..e167f4105f 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -297,13 +297,13 @@ static int fsck_sha1(unsigned char *sha1) if (obj->flags & SEEN) return 0; obj->flags |= SEEN; - if (obj->type == TYPE_BLOB) + if (obj->type == OBJ_BLOB) return 0; - if (obj->type == TYPE_TREE) + if (obj->type == OBJ_TREE) return fsck_tree((struct tree *) obj); - if (obj->type == TYPE_COMMIT) + if (obj->type == OBJ_COMMIT) return fsck_commit((struct commit *) obj); - if (obj->type == TYPE_TAG) + if (obj->type == OBJ_TAG) return fsck_tag((struct tag *) obj); /* By now, parse_object() would've returned NULL instead. */ return objerror(obj, "unknown type '%d' (internal fsck error)", obj->type); @@ -472,7 +472,7 @@ static int fsck_cache_tree(struct cache_tree *it) } mark_reachable(obj, REACHABLE); obj->used = 1; - if (obj->type != TYPE_TREE) + if (obj->type != OBJ_TREE) err |= objerror(obj, "non-tree in cache-tree"); } for (i = 0; i < it->subtree_nr; i++) |