Andrew's git / gitweb.git / diff
?
builtin-prune.c: use parse_options()
authorMichele Ballabio <barra_cuda@katamail.com>
Sun, 23 Mar 2008 20:50:29 +0000 (21:50 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Mar 2008 20:55:15 +0000 (13:55 -0700)
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>
builtin-prune.c patch | blob | history
diff --git a/builtin-prune.c b/builtin-prune.c
index bb8ead92cf41c3cbdbc421a1490fb40ce19f11c3..71caac578d42e7153279ea94684c749ed9b78d0b 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -4,8 +4,12 @@
 #include "revision.h"
 #include "builtin.h"
 #include "reachable.h"
 #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;
 
 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 cmd_prune(int argc, const char **argv, const char *prefix)
 {
-       int i;
        struct rev_info revs;
        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);
 
        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();
        prune_object_dir(get_object_directory());
 
        sync();