summaryrefslogtreecommitdiff
path: root/builtin-prune.c
diff options
context:
space:
mode:
authorMichele Ballabio <barra_cuda@katamail.com>2008-03-23 20:50:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-27 20:55:15 (GMT)
commit629de472b67bdb6b1fbdc72a95e1f569e3b8f02d (patch)
tree66348119614e4da2dd0a51a0068be4eb79a00664 /builtin-prune.c
parent0c62705a0d9730df027a4e4074a8d9d5293e0b9b (diff)
downloadgit-629de472b67bdb6b1fbdc72a95e1f569e3b8f02d.zip
git-629de472b67bdb6b1fbdc72a95e1f569e3b8f02d.tar.gz
git-629de472b67bdb6b1fbdc72a95e1f569e3b8f02d.tar.bz2
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>
Diffstat (limited to 'builtin-prune.c')
-rw-r--r--builtin-prune.c38
1 files changed, 16 insertions, 22 deletions
diff --git a/builtin-prune.c b/builtin-prune.c
index bb8ead9..71caac5 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -4,8 +4,12 @@
#include "revision.h"
#include "builtin.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 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 i;
struct rev_info revs;
-
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (!strcmp(arg, "-n")) {
- show_only = 1;
- continue;
- }
- 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);
- }
+ const struct option options[] = {
+ OPT_BOOLEAN('n', NULL, &show_only,
+ "do not remove, show only"),
+ OPT_DATE(0, "expire", &expire,
+ "expire objects older than <time>"),
+ OPT_END()
+ };
save_commit_buffer = 0;
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());
sync();