git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/fetch.c b/fetch.c
index 238032b798008cd1f96d5083b63dc582f8191a1d..989d7a47884ec7bac05d329baeb97bdb12b7b22e 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -118,20 +118,20 @@ static struct object_list **process_queue_end = &process_queue;
 
 static int process_object(struct object *obj)
 {
-       if (obj->type == TYPE_COMMIT) {
+       if (obj->type == OBJ_COMMIT) {
                if (process_commit((struct commit *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == TYPE_TREE) {
+       if (obj->type == OBJ_TREE) {
                if (process_tree((struct tree *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == TYPE_BLOB) {
+       if (obj->type == OBJ_BLOB) {
                return 0;
        }
-       if (obj->type == TYPE_TAG) {
+       if (obj->type == OBJ_TAG) {
                if (process_tag((struct tag *)obj))
                        return -1;
                return 0;