summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorMichele Ballabio <barra_cuda@katamail.com>2008-06-22 14:39:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-23 01:14:37 (GMT)
commit6422f633216475939f9a6f317e41a164737cbb02 (patch)
treefdea6594e42337e468184d9caa900e76b0f114b0 /parse-options.c
parent82936f295f803a8f1fbe2d89856e9371baa3536c (diff)
downloadgit-6422f633216475939f9a6f317e41a164737cbb02.zip
git-6422f633216475939f9a6f317e41a164737cbb02.tar.gz
git-6422f633216475939f9a6f317e41a164737cbb02.tar.bz2
parse-options.c: fix documentation syntax of optional arguments
When an argument for an option is optional, short options don't need a space between the option and the argument, and long options need a "=". Otherwise, arguments are misinterpreted. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/parse-options.c b/parse-options.c
index acf3fe3..f8d52e2 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -344,7 +344,10 @@ void usage_with_options_internal(const char * const *usagestr,
break;
case OPTION_INTEGER:
if (opts->flags & PARSE_OPT_OPTARG)
- pos += fprintf(stderr, "[<n>]");
+ if (opts->long_name)
+ pos += fprintf(stderr, "[=<n>]");
+ else
+ pos += fprintf(stderr, "[<n>]");
else
pos += fprintf(stderr, " <n>");
break;
@@ -355,12 +358,18 @@ void usage_with_options_internal(const char * const *usagestr,
case OPTION_STRING:
if (opts->argh) {
if (opts->flags & PARSE_OPT_OPTARG)
- pos += fprintf(stderr, " [<%s>]", opts->argh);
+ if (opts->long_name)
+ pos += fprintf(stderr, "[=<%s>]", opts->argh);
+ else
+ pos += fprintf(stderr, "[<%s>]", opts->argh);
else
pos += fprintf(stderr, " <%s>", opts->argh);
} else {
if (opts->flags & PARSE_OPT_OPTARG)
- pos += fprintf(stderr, " [...]");
+ if (opts->long_name)
+ pos += fprintf(stderr, "[=...]");
+ else
+ pos += fprintf(stderr, "[...]");
else
pos += fprintf(stderr, " ...");
}