undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/verboseprune'

Browse Source 
* mg/verboseprune:
  make prune report removed objects on -v
This commit is contained in:
Shawn O. Pearce 2008-10-09 10:18:41 -07:00
commit e4fff5ce65
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-prune.txt
View File

@ -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.

10
builtin-prune.c
View File

@ -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()