diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-11 20:45:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-12 23:18:03 -0700 |
| commit | 1974632c664c2d573b36a00fa993c1c13dd8a967 (patch) | |
| tree | 435ba8ee055c206c984240fc28a20ef15bc47e4d /name-rev.c | |
| parent | d3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff) | |
| download | git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz | |
Remove TYPE_* constant macros and use object_type enums consistently.
This updates the type-enumeration constants introduced to reduce
the memory footprint of "struct object" to match the type bits
already used in the packfile format, by removing the former
(i.e. TYPE_* constant macros) and using the latter (i.e. enum
object_type) throughout the code for consistency.
Eventually we can stop passing around the "type strings"
entirely, and this will help - no confusion about two different
integer enumeration.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'name-rev.c')
| -rw-r--r-- | name-rev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/name-rev.c b/name-rev.c index 083d067e17..f92f14e32f 100644 --- a/name-rev.c +++ b/name-rev.c @@ -84,14 +84,14 @@ static int name_ref(const char *path, const unsigned char *sha1) if (tags_only && strncmp(path, "refs/tags/", 10)) return 0; - while (o && o->type == TYPE_TAG) { + while (o && o->type == OBJ_TAG) { struct tag *t = (struct tag *) o; if (!t->tagged) break; /* broken repository */ o = parse_object(t->tagged->sha1); deref = 1; } - if (o && o->type == TYPE_COMMIT) { + if (o && o->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)o; if (!strncmp(path, "refs/heads/", 11)) @@ -111,7 +111,7 @@ static const char* get_rev_name(struct object *o) struct rev_name *n; struct commit *c; - if (o->type != TYPE_COMMIT) + if (o->type != OBJ_COMMIT) return "undefined"; c = (struct commit *) o; n = c->util; @@ -172,7 +172,7 @@ int main(int argc, char **argv) } o = deref_tag(parse_object(sha1), *argv, 0); - if (!o || o->type != TYPE_COMMIT) { + if (!o || o->type != OBJ_COMMIT) { fprintf(stderr, "Could not get commit for %s. Skipping.\n", *argv); continue; |