X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-prune.c;h=8591d28b8e91c94636e9bf8b7e8ff5abcc0705e9;hb=3c23bea8ac211332086d26c90cd7348d6d0e129f;hp=7290e6d9aa9e26cc8256a34ed22028e80936c010;hpb=2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3;p=git.git

diff --git a/builtin-prune.c b/builtin-prune.c
index 7290e6d9a..8591d28b8 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -16,8 +16,15 @@ static struct rev_info revs;
 
 static int prune_object(char *path, const char *filename, const unsigned char *sha1)
 {
+	char buf[20];
+	const char *type;
+
 	if (show_only) {
-		printf("would prune %s/%s\n", path, filename);
+		if (sha1_object_info(sha1, buf, NULL))
+			type = "unknown";
+		else
+			type = buf;
+		printf("%s %s\n", sha1_to_hex(sha1), type);
 		return 0;
 	}
 	unlink(mkpath("%s/%s", path, filename));
@@ -174,7 +181,7 @@ static void walk_commit_list(struct rev_info *revs)
 	}
 }
 
-static int add_one_ref(const char *path, const unsigned char *sha1)
+static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
 	struct object *object = parse_object(sha1);
 	if (!object)
@@ -240,7 +247,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	revs.tree_objects = 1;
 
 	/* Add all external refs */
-	for_each_ref(add_one_ref);
+	for_each_ref(add_one_ref, NULL);
 
 	/* Add all refs from the index file */
 	add_cache_refs();