Cumulative update of merge-recursive in C

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 63bad0e96ade657bef21d9ca0e0de2e0ba8af61c..8f328713374679b023f1f8caaacab592c9e4f9a2 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -167,16 +167,16 @@ static void show_commit_list(struct rev_info *revs)
                const char *name = pending->name;
                if (obj->flags & (UNINTERESTING | SEEN))
                        continue;
-               if (obj->type == TYPE_TAG) {
+               if (obj->type == OBJ_TAG) {
                        obj->flags |= SEEN;
                        add_object_array(obj, name, &objects);
                        continue;
                }
-               if (obj->type == TYPE_TREE) {
+               if (obj->type == OBJ_TREE) {
                        process_tree((struct tree *)obj, &objects, NULL, name);
                        continue;
                }
-               if (obj->type == TYPE_BLOB) {
+               if (obj->type == OBJ_BLOB) {
                        process_blob((struct blob *)obj, &objects, NULL, name);
                        continue;
                }