From: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCHv2 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
Date: Wed, 31 Jul 2013 18:28:34 +0200 [thread overview]
Message-ID: <1375288117-1576-7-git-send-email-stefanbeller@googlemail.com> (raw)
In-Reply-To: <1375288117-1576-1-git-send-email-stefanbeller@googlemail.com>
This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27). hash-object is a plumbing layer command, so better
not change the input/output behavior for now.
Unfortunately we have these lines relying on the count up mechanism of
OPT_BOOLEAN:
if (hashstdin > 1)
errstr = "Multiple --stdin arguments are not supported";
Maybe later, when the plumbing is refined (git 2.0?) we can drop that
errormessage and replace the OPT_COUNTUP by OPT_BOOL.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
builtin/hash-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 4aea5bb..d7fcf4c 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -71,7 +71,7 @@ static const char *vpath;
static const struct option hash_object_options[] = {
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
OPT_BOOL('w', NULL, &write_object, N_("write the object into the object database")),
- OPT_BOOLEAN( 0 , "stdin", &hashstdin, N_("read the object from stdin")),
+ OPT_COUNTUP( 0 , "stdin", &hashstdin, N_("read the object from stdin")),
OPT_BOOL( 0 , "stdin-paths", &stdin_paths, N_("read file names from stdin")),
OPT_BOOL( 0 , "no-filters", &no_filters, N_("store file as is without filters")),
OPT_STRING( 0 , "path", &vpath, N_("file"), N_("process file as it were from this path")),
--
1.8.4.rc0.1.g8f6a3e5
next prev parent reply other threads:[~2013-07-31 16:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 16:28 [PATCHv2 0/9] Removing deprecated parsing macros Stefan Beller
2013-07-31 16:28 ` [PATCHv2 1/9] Remove deprecated OPTION_BOOLEAN for parsing arguments Stefan Beller
2013-07-31 16:28 ` [PATCHv2 2/9] Replace deprecated OPT_BOOLEAN by OPT_BOOL Stefan Beller
2013-07-31 16:28 ` [PATCHv2 3/9] log, format-patch: parsing uses OPT__QUIET Stefan Beller
2013-07-31 17:08 ` Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 4/9] checkout: remove superfluous local variable Stefan Beller
2013-07-31 16:28 ` [PATCHv2 5/9] branch, commit, name-rev: ease up boolean conditions Stefan Beller
2013-07-31 16:28 ` Stefan Beller [this message]
2013-07-31 17:12 ` [PATCHv2 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 7/9] config: parsing options: config file flag multiple times Stefan Beller
2013-07-31 16:28 ` [PATCHv2 8/9] checkout-index: Fix negations of even numbers of -n Stefan Beller
2013-07-31 17:16 ` Eric Sunshine
2013-07-31 17:21 ` Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 9/9] revert: use the OPT_CMDMODE for parsing, reducing code Stefan Beller
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=1375288117-1576-7-git-send-email-stefanbeller@googlemail.com \
--to=stefanbeller@googlemail.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.
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).