summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-14 06:38:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-14 06:38:40 (GMT)
commitbf6d324e7333f62f6aee56ebb886e82e1f49e1ce (patch)
tree946411bff17166b4d30cc7cfec4b8583a05382a7 /merge-recursive.c
parent06d30f4f3eea71bce4cf48db3ea384976b3983b7 (diff)
parente5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff)
downloadgit-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.zip
git-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.tar.gz
git-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index cf81768..8d30519 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));