X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=7bff2a10b1044651a776b42d4ee3d91661830aa2;hb=refs%2Fheads%2Forigin;hp=75c648c13c6c50335ffc3e79f5d6303bea20104e;hpb=75c3a5ccdf114b5485e4828db1923bf4a35b19e2;p=git.git

diff --git a/revision.c b/revision.c
index 75c648c1..7bff2a10 100644
--- a/revision.c
+++ b/revision.c
@@ -140,7 +140,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
 	/*
 	 * Tag object? Look what it points to..
 	 */
-	while (object->type == tag_type) {
+	while (object->type == TYPE_TAG) {
 		struct tag *tag = (struct tag *) object;
 		if (revs->tag_objects && !(flags & UNINTERESTING))
 			add_pending_object(revs, object, tag->tag);
@@ -153,7 +153,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
 	 * Commit object? Just return it, we'll do all the complex
 	 * reachability crud.
 	 */
-	if (object->type == commit_type) {
+	if (object->type == TYPE_COMMIT) {
 		struct commit *commit = (struct commit *)object;
 		if (parse_commit(commit) < 0)
 			die("unable to parse commit %s", name);
@@ -169,7 +169,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
 	 * Tree object? Either mark it uniniteresting, or add it
 	 * to the list of objects to look at later..
 	 */
-	if (object->type == tree_type) {
+	if (object->type == TYPE_TREE) {
 		struct tree *tree = (struct tree *)object;
 		if (!revs->tree_objects)
 			return NULL;
@@ -184,7 +184,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
 	/*
 	 * Blob object? You know the drill by now..
 	 */
-	if (object->type == blob_type) {
+	if (object->type == TYPE_BLOB) {
 		struct blob *blob = (struct blob *)object;
 		if (!revs->blob_objects)
 			return NULL;
@@ -498,11 +498,11 @@ static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
 		return 0;
 	while (1) {
 		it = get_reference(revs, arg, sha1, 0);
-		if (strcmp(it->type, tag_type))
+		if (it->type != TYPE_TAG)
 			break;
 		memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
 	}
-	if (strcmp(it->type, commit_type))
+	if (it->type != TYPE_COMMIT)
 		return 0;
 	commit = (struct commit *)it;
 	for (parents = commit->parents; parents; parents = parents->next) {
@@ -949,9 +949,11 @@ struct commit *get_revision(struct rev_info *revs)
 	}
 
 	do {
-		struct commit *commit = revs->commits->item;
+		struct commit_list *entry = revs->commits;
+		struct commit *commit = entry->item;
 
-		revs->commits = revs->commits->next;
+		revs->commits = entry->next;
+		free(entry);
 
 		/*
 		 * If we haven't done the list limiting, we need to look at