prune-packed: migrate to parse-options

Add long options for dry run and quiet to be more consistent with the
rest of git.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index b5f26ce..abfc6b6 100644 (file)
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -8,7 +8,7 @@ git-prune-packed - Remove extra objects that are already in pack files
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git prune-packed' [-n] [-q]
+'git prune-packed' [-n|--dry-run] [-q|--quiet]

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -28,10 +28,12 @@ disk storage, etc.
 OPTIONS
 -------
 -n::
 OPTIONS
 -------
 -n::

+--dry-run::

         Don't actually remove any objects, only show those that would have been
         removed.
 
 -q::
         Don't actually remove any objects, only show those that would have been
         removed.
 
 -q::

+--quiet::

        Squelch the progress indicator.
 
 Author
        Squelch the progress indicator.
 
 Author

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 00590b1..be99eb0 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,9 +1,12 @@
 #include "builtin.h"
 #include "cache.h"
 #include "progress.h"
 #include "builtin.h"
 #include "cache.h"
 #include "progress.h"

+#include "parse-options.h"

 
 

-static const char prune_packed_usage[] =
-"git prune-packed [-n] [-q]";
+static const char * const prune_packed_usage[] = {
+       "git prune-packed [-n|--dry-run] [-q|--quiet]",
+       NULL
+};

 
 #define DRY_RUN 01
 #define VERBOSE 02
 
 #define DRY_RUN 01
 #define VERBOSE 02


@@ -68,24 +71,16 @@ void prune_packed_objects(int opts)
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {

-       int i;

        int opts = VERBOSE;
        int opts = VERBOSE;

+       const struct option prune_packed_options[] = {
+               OPT_BIT('n', "dry-run", &opts, "dry run", DRY_RUN),
+               OPT_NEGBIT('q', "quiet", &opts, "be quiet", VERBOSE),
+               OPT_END()
+       };

 
 

-       for (i = 1; i < argc; i++) {
-               const char *arg = argv[i];
+       argc = parse_options(argc, argv, prefix, prune_packed_options,
+                            prune_packed_usage, 0);

 
 

-               if (*arg == '-') {
-                       if (!strcmp(arg, "-n"))
-                               opts |= DRY_RUN;
-                       else if (!strcmp(arg, "-q"))
-                               opts &= ~VERBOSE;
-                       else
-                               usage(prune_packed_usage);
-                       continue;
-               }
-               /* Handle arguments here .. */
-               usage(prune_packed_usage);
-       }

        prune_packed_objects(opts);
        return 0;
 }
        prune_packed_objects(opts);
        return 0;
 }