make prune report removed objects on -v

This adds an option "-v" which makes "git prune" more verbose: It outputs all removed objects while removing them. Signed-off-by: N Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: N Shawn O. Pearce <spearce@spearce.org>

make prune report removed objects on -v
This adds an option "-v" which makes "git prune" more verbose: It outputs all removed objects while removing them. Signed-off-by: N Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: N Shawn O. Pearce <spearce@spearce.org>
b35ddf41 · Michael J Gruber · Shawn O. Pearce · 8b745e3f · b35ddf41 · b35ddf41
隐藏空白更改
内联并排

Showing with 11 addition and 4 deletion

Documentation/git-prune.txt Documentation/git-prune.txt +4 -1

builtin-prune.c builtin-prune.c +7 -3

未找到文件。
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -8,7 +8,7 @@ git-prune - Prune all unreachable objects from the object database
 SYNOPSIS
 --------
-'git-prune' [-n] [--expire <expire>] [--] [<head>...]
+'git-prune' [-n] [-v] [--expire <expire>] [--] [<head>...]
 DESCRIPTION
 -----------
@@ -34,6 +34,9 @@ OPTIONS
 	Do not remove anything; just report what it would
 	remove.
+-v::
+	Report all removed objects.
 \--::
 	Do not interpret any more arguments as options.

--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -7,10 +7,11 @@
 #include "parse-options.h"
 static const char * const prune_usage[] = {
-	"git prune [-n] [--expire <time>] [--] [<head>...]",
+	"git prune [-n] [-v] [--expire <time>] [--] [<head>...]",
 	NULL
 };
 static int show_only;
+static int verbose;
 static unsigned long expire;
 static int prune_tmp_object(const char *path, const char *filename)
@@ -39,11 +40,12 @@ static int prune_object(char *path, const char *filename, const unsigned char *s
 		if (st.st_mtime > expire)
 			return 0;
 	}
-	if (show_only) {
+	if (show_only || verbose) {
 		enum object_type type = sha1_object_info(sha1, NULL);
 		printf("%s %s\n", sha1_to_hex(sha1),
 		       (type > 0) ? typename(type) : "unknown");
-	} else
+	}
+	if (!show_only)
 		unlink(fullpath);
 	return 0;
 }
@@ -135,6 +137,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	const struct option options[] = {
 		OPT_BOOLEAN('n', NULL, &show_only,
 			    "do not remove, show only"),
+		OPT_BOOLEAN('v', NULL, &verbose,
+			"report pruned objects"),
 		OPT_DATE(0, "expire", &expire,
 			 "expire objects older than <time>"),
 		OPT_END()