builtin-prune.c: use parse_options()
Using the OPT_DATE() introduced earlier, this updates builtin-prune to use parse_options(). Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0c62705a0d
commit
629de472b6
@ -4,8 +4,12 @@
|
|||||||
#include "revision.h"
|
#include "revision.h"
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
#include "reachable.h"
|
#include "reachable.h"
|
||||||
|
#include "parse-options.h"
|
||||||
|
|
||||||
static const char prune_usage[] = "git-prune [-n]";
|
static const char * const prune_usage[] = {
|
||||||
|
"git-prune [-n] [--expire <time>] [--] [<head>...]",
|
||||||
|
NULL
|
||||||
|
};
|
||||||
static int show_only;
|
static int show_only;
|
||||||
static unsigned long expire;
|
static unsigned long expire;
|
||||||
|
|
||||||
@ -123,32 +127,22 @@ static void remove_temporary_files(void)
|
|||||||
|
|
||||||
int cmd_prune(int argc, const char **argv, const char *prefix)
|
int cmd_prune(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
struct rev_info revs;
|
struct rev_info revs;
|
||||||
|
const struct option options[] = {
|
||||||
for (i = 1; i < argc; i++) {
|
OPT_BOOLEAN('n', NULL, &show_only,
|
||||||
const char *arg = argv[i];
|
"do not remove, show only"),
|
||||||
if (!strcmp(arg, "-n")) {
|
OPT_DATE(0, "expire", &expire,
|
||||||
show_only = 1;
|
"expire objects older than <time>"),
|
||||||
continue;
|
OPT_END()
|
||||||
}
|
};
|
||||||
if (!strcmp(arg, "--expire")) {
|
|
||||||
if (++i < argc) {
|
|
||||||
expire = approxidate(argv[i]);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!prefixcmp(arg, "--expire=")) {
|
|
||||||
expire = approxidate(arg + 9);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
usage(prune_usage);
|
|
||||||
}
|
|
||||||
|
|
||||||
save_commit_buffer = 0;
|
save_commit_buffer = 0;
|
||||||
init_revisions(&revs, prefix);
|
init_revisions(&revs, prefix);
|
||||||
mark_reachable_objects(&revs, 1);
|
|
||||||
|
|
||||||
|
argc = parse_options(argc, argv, options, prune_usage, 0);
|
||||||
|
if (argc)
|
||||||
|
die ("unrecognized argument: %s", name);
|
||||||
|
mark_reachable_objects(&revs, 1);
|
||||||
prune_object_dir(get_object_directory());
|
prune_object_dir(get_object_directory());
|
||||||
|
|
||||||
sync();
|
sync();
|
||||||
|
Loading…
Reference in New Issue
Block a user