Ooh. Make git-rev-list --object associate a name with objects.

Linus Torvalds · Linus Torvalds · commit 9ce43d1c90dc · 2005-06-26T15:26:05.000-07:00
The name isn't unique, it's just the first name that object is reached
through, so it's really nothing more than a hint.
diff --git a/object.h b/object.h
@@ -4,6 +4,7 @@
 struct object_list {
 	struct object *item;
 	struct object_list *next;
+	const char *name;
 };
 
 struct object {
diff --git a/rev-list.c b/rev-list.c
@@ -98,16 +98,17 @@ static int process_commit(struct commit * commit)
 	return CONTINUE;
 }
 
-static struct object_list **add_object(struct object *obj, struct object_list **p)
+static struct object_list **add_object(struct object *obj, struct object_list **p, const char *name)
 {
 	struct object_list *entry = xmalloc(sizeof(*entry));
 	entry->item = obj;
 	entry->next = NULL;
+	entry->name = name;
 	*p = entry;
 	return &entry->next;
 }
 
-static struct object_list **process_blob(struct blob *blob, struct object_list **p)
+static struct object_list **process_blob(struct blob *blob, struct object_list **p, const char *name)
 {
 	struct object *obj = &blob->object;
 
@@ -116,10 +117,10 @@ static struct object_list **process_blob(struct blob *blob, struct object_list *
 	if (obj->flags & (UNINTERESTING | SEEN))
 		return p;
 	obj->flags |= SEEN;
-	return add_object(obj, p);
+	return add_object(obj, p, name);
 }
 
-static struct object_list **process_tree(struct tree *tree, struct object_list **p)
+static struct object_list **process_tree(struct tree *tree, struct object_list **p, const char *name)
 {
 	struct object *obj = &tree->object;
 	struct tree_entry_list *entry;
@@ -131,12 +132,12 @@ static struct object_list **process_tree(struct tree *tree, struct object_list *
 	if (parse_tree(tree) < 0)
 		die("bad tree object %s", sha1_to_hex(obj->sha1));
 	obj->flags |= SEEN;
-	p = add_object(obj, p);
+	p = add_object(obj, p, name);
 	for (entry = tree->entries ; entry ; entry = entry->next) {
 		if (entry->directory)
-			p = process_tree(entry->item.tree, p);
+			p = process_tree(entry->item.tree, p, entry->name);
 		else
-			p = process_blob(entry->item.blob, p);
+			p = process_blob(entry->item.blob, p, entry->name);
 	}
 	return p;
 }
@@ -147,12 +148,12 @@ static void show_commit_list(struct commit_list *list)
 	while (list) {
 		struct commit *commit = pop_most_recent_commit(&list, SEEN);
 
-		p = process_tree(commit->tree, p);
+		p = process_tree(commit->tree, p, "");
 		if (process_commit(commit) == STOP)
 			break;
 	}
 	while (objects) {
-		puts(sha1_to_hex(objects->item->sha1));
+		printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
 		objects = objects->next;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -98,16 +98,17 @@ static int process_commit(struct commit * commit)`
`98`	`98`	`return CONTINUE;`
`99`	`99`	`}`
`100`	`100`
`101`		`-static struct object_list *add_object(struct object obj, struct object_list **p)`
	`101`	`+static struct object_list *add_object(struct object obj, struct object_list *p, const char name)`
`102`	`102`	`{`
`103`	`103`	`struct object_list entry = xmalloc(sizeof(entry));`
`104`	`104`	`entry->item = obj;`
`105`	`105`	`entry->next = NULL;`
	`106`	`+ entry->name = name;`
`106`	`107`	`*p = entry;`
`107`	`108`	`return &entry->next;`
`108`	`109`	`}`
`109`	`110`
`110`		`-static struct object_list *process_blob(struct blob blob, struct object_list **p)`
	`111`	`+static struct object_list *process_blob(struct blob blob, struct object_list *p, const char name)`
`111`	`112`	`{`
`112`	`113`	`struct object *obj = &blob->object;`
`113`	`114`
`@@ -116,10 +117,10 @@ static struct object_list *process_blob(struct blob blob, struct object_list *`
`116`	`117`	`if (obj->flags & (UNINTERESTING \| SEEN))`
`117`	`118`	`return p;`
`118`	`119`	`obj->flags \|= SEEN;`
`119`		`- return add_object(obj, p);`
	`120`	`+ return add_object(obj, p, name);`
`120`	`121`	`}`
`121`	`122`
`122`		`-static struct object_list *process_tree(struct tree tree, struct object_list **p)`
	`123`	`+static struct object_list *process_tree(struct tree tree, struct object_list *p, const char name)`
`123`	`124`	`{`
`124`	`125`	`struct object *obj = &tree->object;`
`125`	`126`	`struct tree_entry_list *entry;`
`@@ -131,12 +132,12 @@ static struct object_list *process_tree(struct tree tree, struct object_list *`
`131`	`132`	`if (parse_tree(tree) < 0)`
`132`	`133`	`die("bad tree object %s", sha1_to_hex(obj->sha1));`
`133`	`134`	`obj->flags \|= SEEN;`
`134`		`- p = add_object(obj, p);`
	`135`	`+ p = add_object(obj, p, name);`
`135`	`136`	`for (entry = tree->entries ; entry ; entry = entry->next) {`
`136`	`137`	`if (entry->directory)`
`137`		`- p = process_tree(entry->item.tree, p);`
	`138`	`+ p = process_tree(entry->item.tree, p, entry->name);`
`138`	`139`	`else`
`139`		`- p = process_blob(entry->item.blob, p);`
	`140`	`+ p = process_blob(entry->item.blob, p, entry->name);`
`140`	`141`	`}`
`141`	`142`	`return p;`
`142`	`143`	`}`
`@@ -147,12 +148,12 @@ static void show_commit_list(struct commit_list *list)`
`147`	`148`	`while (list) {`
`148`	`149`	`struct commit *commit = pop_most_recent_commit(&list, SEEN);`
`149`	`150`
`150`		`- p = process_tree(commit->tree, p);`
	`151`	`+ p = process_tree(commit->tree, p, "");`
`151`	`152`	`if (process_commit(commit) == STOP)`
`152`	`153`	`break;`
`153`	`154`	`}`
`154`	`155`	`while (objects) {`
`155`		`- puts(sha1_to_hex(objects->item->sha1));`
	`156`	`+ printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);`
`156`	`157`	`objects = objects->next;`
`157`	`158`	`}`
`158`	`159`	`}`