X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch.c;h=238032b798008cd1f96d5083b63dc582f8191a1d;hb=HEAD;hp=e040ef97b6b7e29d9e6482ad0ebead589e86a2a2;hpb=16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca;p=git.git

diff --git a/fetch.c b/fetch.c
index e040ef97..238032b7 100644
--- a/fetch.c
+++ b/fetch.c
@@ -118,27 +118,27 @@ static struct object_list **process_queue_end = &process_queue;
 
 static int process_object(struct object *obj)
 {
-	if (obj->type == commit_type) {
+	if (obj->type == TYPE_COMMIT) {
 		if (process_commit((struct commit *)obj))
 			return -1;
 		return 0;
 	}
-	if (obj->type == tree_type) {
+	if (obj->type == TYPE_TREE) {
 		if (process_tree((struct tree *)obj))
 			return -1;
 		return 0;
 	}
-	if (obj->type == blob_type) {
+	if (obj->type == TYPE_BLOB) {
 		return 0;
 	}
-	if (obj->type == tag_type) {
+	if (obj->type == TYPE_TAG) {
 		if (process_tag((struct tag *)obj))
 			return -1;
 		return 0;
 	}
 	return error("Unable to determine requirements "
 		     "of type %s for %s",
-		     obj->type, sha1_to_hex(obj->sha1));
+		     typename(obj->type), sha1_to_hex(obj->sha1));
 }
 
 static int process(struct object *obj)
@@ -150,7 +150,8 @@ static int process(struct object *obj)
 	if (has_sha1_file(obj->sha1)) {
 		/* We already have it, so we should scan it now. */
 		obj->flags |= TO_SCAN;
-	} else {
+	}
+	else {
 		if (obj->flags & COMPLETE)
 			return 0;
 		prefetch(obj->sha1);
@@ -178,9 +179,7 @@ static int loop(void)
 		 */
 		if (! (obj->flags & TO_SCAN)) {
 			if (fetch(obj->sha1)) {
-				report_missing(obj->type
-					       ? obj->type
-					       : "object", obj->sha1);
+				report_missing(typename(obj->type), obj->sha1);
 				return -1;
 			}
 		}
@@ -255,7 +254,8 @@ int pull(char *target)
 		if (write_ref_log_details) {
 			msg = xmalloc(strlen(write_ref_log_details) + 12);
 			sprintf(msg, "fetch from %s", write_ref_log_details);
-		} else
+		}
+		else
 			msg = NULL;
 		ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
 		if (msg)