[PATCHv3 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
- From
Stefan Beller <stefanbeller@googlemail.com>
- Date
- Aug 3, 2013, 11:51 UTC
- Message-ID
- <1375530686-2309-7-git-send-email-stefanbeller@googlemail.com>
- In-Reply-To
- <1375530686-2309-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 error message 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.16.g7fca822.dirty