diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:41 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:41 -0700 |
| commit | e4fff5ce65b80fed050be7c761466e16105a32c5 (patch) | |
| tree | 3e4b0a91b40a5be5497bc8e6f66fc7b4b0949050 | |
| parent | 635536488c3efcf8495333b6a94e3e33c36fc055 (diff) | |
| parent | b35ddf41eeee1465c9c5a34357664d22b929b79a (diff) | |
| download | git-e4fff5ce65b80fed050be7c761466e16105a32c5.tar.gz git-e4fff5ce65b80fed050be7c761466e16105a32c5.tar.xz | |
Merge branch 'mg/verboseprune'
* mg/verboseprune:
make prune report removed objects on -v
| -rw-r--r-- | Documentation/git-prune.txt | 5 | ||||
| -rw-r--r-- | builtin-prune.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index 54f1dab38..da6055d4b 100644 --- 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. diff --git a/builtin-prune.c b/builtin-prune.c index 1663f8bdb..7b4ec80e6 100644 --- 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() |