From: Junio C Hamano <junio@pobox.com>
To: Michele Ballabio <barra_cuda@katamail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: [PATCH 4/5] builtin-prune.c: use parse_options()
Date: Mon, 24 Mar 2008 23:59:43 -0700 [thread overview]
Message-ID: <7vzlsnmgps.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 200803242218.44026.barra_cuda@katamail.com
From: Michele Ballabio <barra_cuda@katamail.com>
Date: Sun, 23 Mar 2008 21:50:29 +0100
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 | 38 ++++++++++++++++----------------------
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();
--
1.5.5.rc1.121.g1594
next prev parent reply other threads:[~2008-03-25 7:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-23 20:50 [PATCH 2/2] builtin-prune.c: fix object parsing and use parse_options() Michele Ballabio
2008-03-23 22:21 ` Johannes Schindelin
2008-03-24 12:31 ` Michele Ballabio
2008-03-24 13:13 ` Johannes Schindelin
2008-03-24 14:02 ` [PATCH 3/2] parse-options.c: introduce OPT_DATE Michele Ballabio
2008-03-24 13:59 ` Johannes Schindelin
2008-03-24 16:25 ` Michele Ballabio
2008-03-24 20:03 ` Johannes Schindelin
2008-03-24 20:10 ` Junio C Hamano
2008-03-24 21:18 ` Michele Ballabio
2008-03-25 6:58 ` Junio C Hamano
2008-03-25 6:59 ` [PATCH 1/5] " Junio C Hamano
2008-03-25 6:59 ` [PATCH 2/5] test_must_fail: 129 is a valid error code from usage() Junio C Hamano
2008-03-25 10:01 ` Johannes Schindelin
2008-03-25 11:21 ` Johannes Sixt
2008-03-25 19:27 ` Johannes Schindelin
2008-03-25 6:59 ` [PATCH 3/5] Add tests for git-prune Junio C Hamano
2008-03-25 6:59 ` Junio C Hamano [this message]
2008-03-25 6:59 ` [PATCH 5/5] builtin-prune: protect objects listed on the command line Junio C Hamano
2008-03-27 16:32 ` Junio C Hamano
2008-03-27 16:35 ` Johannes Schindelin
2008-03-27 21:11 ` Michele Ballabio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vzlsnmgps.fsf@gitster.siamese.dyndns.org \
--to=junio@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).