From: Andy Parkins <andyparkins@gmail.com>
Date: Thu, 2 Nov 2006 11:12:26 +0000 (+0100)
Subject: Improve git-prune -n output
X-Git-Tag: v1.5.0-rc0~234^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=21f88ac84a024fcc73a22547e51509aa1459ab03;p=git.git

Improve git-prune -n output

prune_object() in show_only mode would previously just show the path to the
object that would be deleted.  The path the object is stored in shouldn't be
shown to users, they only know about sha1 identifiers so show that instead.

Further, the sha1 alone isn't that useful for examining what is going to be
deleted.  This patch also adds the object type to the output, which makes it
easy to pick out, say, the commits and use git-show to display them.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-prune.c b/builtin-prune.c
index d853902c5..286a94c3f 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -16,8 +16,14 @@ 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);
+		type = buf;
+		if (sha1_object_info(sha1, type, NULL))
+			type = "unknown";
+		printf("%s %s\n", sha1_to_hex(sha1), type );
 		return 0;
 	}
 	unlink(mkpath("%s/%s", path, filename));