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 /describe.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 'describe.c')
| -rw-r--r-- | describe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/describe.c b/describe.c index 8e68d5df33..324ca8965b 100644 --- a/describe.c +++ b/describe.c @@ -67,7 +67,7 @@ static int get_name(const char *path, const unsigned char *sha1) * Otherwise only annotated tags are used. */ if (!strncmp(path, "refs/tags/", 10)) { - if (object->type == TYPE_TAG) + if (object->type == OBJ_TAG) prio = 2; else prio = 1; |