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 /builtin-fmt-merge-msg.c | |
| parent | d3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff) | |
| download | git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.xz | |
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 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index fe0ef44b4..f20b27b8a 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -181,7 +181,7 @@ static void shortlog(const char *name, unsigned char *sha1, int flags = UNINTERESTING | TREECHANGE | SEEN | SHOWN | ADDED; branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40); - if (!branch || branch->type != TYPE_COMMIT) + if (!branch || branch->type != OBJ_COMMIT) return; setup_revisions(0, NULL, rev, NULL); |