X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-rev-list.c;h=71353eb19db158a60a5ae94f83f53059adc3399b;hb=HEAD;hp=17c04b962d82701ee6fd17ad15e368e1c283af25;hpb=16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca;p=git.git

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 17c04b96..71353eb1 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -89,6 +89,14 @@ static void show_commit(struct commit *commit)
 		printf("%s%c", pretty_header, hdr_termination);
 	}
 	fflush(stdout);
+	if (commit->parents) {
+		free_commit_list(commit->parents);
+		commit->parents = NULL;
+	}
+	if (commit->buffer) {
+		free(commit->buffer);
+		commit->buffer = NULL;
+	}
 }
 
 static struct object_list **process_blob(struct blob *blob,
@@ -135,9 +143,9 @@ static struct object_list **process_tree(struct tree *tree,
 
 	while (tree_entry(&desc, &entry)) {
 		if (S_ISDIR(entry.mode))
-			p = process_tree(lookup_tree(entry.sha1), p, &me, name);
+			p = process_tree(lookup_tree(entry.sha1), p, &me, entry.path);
 		else
-			p = process_blob(lookup_blob(entry.sha1), p, &me, name);
+			p = process_blob(lookup_blob(entry.sha1), p, &me, entry.path);
 	}
 	free(tree->buffer);
 	tree->buffer = NULL;
@@ -158,16 +166,16 @@ static void show_commit_list(struct rev_info *revs)
 		const char *name = pending->name;
 		if (obj->flags & (UNINTERESTING | SEEN))
 			continue;
-		if (obj->type == tag_type) {
+		if (obj->type == TYPE_TAG) {
 			obj->flags |= SEEN;
 			p = add_object(obj, p, NULL, name);
 			continue;
 		}
-		if (obj->type == tree_type) {
+		if (obj->type == TYPE_TREE) {
 			p = process_tree((struct tree *)obj, p, NULL, name);
 			continue;
 		}
-		if (obj->type == blob_type) {
+		if (obj->type == TYPE_BLOB) {
 			p = process_blob((struct blob *)obj, p, NULL, name);
 			continue;
 		}