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>maint
parent
c9c3c6781c
commit
7cfe0c9802
|
@ -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
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
-n::
|
-n::
|
||||||
|
--dry-run::
|
||||||
Don't actually remove any objects, only show those that would have been
|
Don't actually remove any objects, only show those that would have been
|
||||||
removed.
|
removed.
|
||||||
|
|
||||||
-q::
|
-q::
|
||||||
|
--quiet::
|
||||||
Squelch the progress indicator.
|
Squelch the progress indicator.
|
||||||
|
|
||||||
Author
|
Author
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
#include "progress.h"
|
#include "progress.h"
|
||||||
|
#include "parse-options.h"
|
||||||
|
|
||||||
static const char prune_packed_usage[] =
|
static const char * const prune_packed_usage[] = {
|
||||||
"git prune-packed [-n] [-q]";
|
"git prune-packed [-n|--dry-run] [-q|--quiet]",
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
#define DRY_RUN 01
|
#define DRY_RUN 01
|
||||||
#define VERBOSE 02
|
#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++) {
|
argc = parse_options(argc, argv, prefix, prune_packed_options,
|
||||||
const char *arg = argv[i];
|
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);
|
prune_packed_objects(opts);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue