From: Michele Ballabio <barra_cuda@katamail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 2/9] builtin-write-tree.c: use parse_options()
Date: Wed, 23 Jul 2008 23:42:05 +0200 [thread overview]
Message-ID: <1216849332-26813-3-git-send-email-barra_cuda@katamail.com> (raw)
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-write-tree.c | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 52a3c01..25f3d8a 100644
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -7,9 +7,12 @@
#include "cache.h"
#include "tree.h"
#include "cache-tree.h"
+#include "parse-options.h"
-static const char write_tree_usage[] =
-"git write-tree [--missing-ok] [--prefix=<prefix>/]";
+static const char * const write_tree_usage[] = {
+ "git write-tree [--missing-ok] [--prefix=<directory>/]",
+ NULL
+};
int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
{
@@ -19,19 +22,19 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
const char *me = "git-write-tree";
git_config(git_default_config, NULL);
- while (1 < argc) {
- const char *arg = argv[1];
- if (!strcmp(arg, "--missing-ok"))
- missing_ok = 1;
- else if (!prefixcmp(arg, "--prefix="))
- prefix = arg + 9;
- else
- usage(write_tree_usage);
- argc--; argv++;
- }
- if (argc > 2)
- die("too many options");
+ const struct option options[] = {
+ OPT_BOOLEAN(0, "missing-ok", &missing_ok,
+ "disable existence check"),
+ OPT_STRING(0, "prefix", &prefix, "directory",
+ "write a tree object for <directory>"),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, write_tree_usage, 0);
+
+ if (argc > 0)
+ usage_with_options(write_tree_usage, options);
ret = write_cache_as_tree(sha1, missing_ok, prefix);
switch (ret) {
--
1.5.6.3
next prev parent reply other threads:[~2008-07-23 21:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 21:42 [PATCH 0/9] Extend use of parse_options() Michele Ballabio
2008-07-23 21:42 ` [PATCH 1/9] builtin-verify-tag.c: use parse_options() Michele Ballabio
2008-07-24 16:59 ` Olivier Marin
2008-07-24 17:08 ` Johannes Schindelin
2008-07-25 15:20 ` Olivier Marin
2008-07-26 0:53 ` Johannes Schindelin
2008-07-28 10:48 ` [PATCH] builtin-verify-tag: fix -v option parsing Olivier Marin
2008-07-28 11:06 ` Johannes Schindelin
2008-07-28 11:42 ` Olivier Marin
2008-07-28 12:10 ` Johannes Schindelin
2008-07-23 21:42 ` Michele Ballabio [this message]
2008-07-23 21:42 ` [PATCH 3/9] builtin-prune-packed.c: use parse_options() Michele Ballabio
2008-07-23 21:42 ` [PATCH 4/9] builtin-ls-tree.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 5/9] builtin-rev-list.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 6/9] builtin-init-db.c: " Michele Ballabio
2008-07-24 16:15 ` Olivier Marin
2008-07-24 17:07 ` Johannes Schindelin
2008-07-25 15:20 ` Olivier Marin
2008-07-26 0:55 ` Johannes Schindelin
2008-07-24 20:07 ` Michele Ballabio
2008-07-25 8:15 ` [PATCH 6/9 - v2] " Michele Ballabio
2008-07-25 15:20 ` [PATCH 6/9] " Olivier Marin
2008-07-25 19:53 ` [PATCH 6/9 - v3] " Michele Ballabio
2008-07-23 21:42 ` [PATCH 7/9] builtin-checkout-index.c: " Michele Ballabio
2008-07-24 14:44 ` Johannes Schindelin
2008-07-24 20:08 ` Michele Ballabio
2008-07-24 20:35 ` Sverre Rabbelier
2008-07-25 9:01 ` René Scharfe
2008-07-25 16:25 ` [PATCH 7/9 - v2] " Michele Ballabio
2008-07-23 21:42 ` [PATCH 8/9] builtin-fetch-pack.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 9/9] builtin-mailinfo.c: " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1216849332-26813-3-git-send-email-barra_cuda@katamail.com \
--to=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).