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 /merge-recursive.c | |
| parent | 06d30f4f3eea71bce4cf48db3ea384976b3983b7 (diff) | |
| parent | e5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff) | |
| download | git-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.tar.gz git-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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index cf81768ee..8d30519db 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1501,7 +1501,7 @@ static struct commit *get_ref(const char *ref) if (get_sha1(ref, sha1)) die("Could not resolve ref '%s'", ref); object = deref_tag(parse_object(sha1), ref, strlen(ref)); - if (object->type != TYPE_COMMIT) + if (object->type != OBJ_COMMIT) return NULL; if (parse_commit((struct commit *)object)) die("Could not parse commit '%s'", sha1_to_hex(object->sha1)); |