diff options
| author | Nicolas Vigier <boklm@mars-attacks.org> | 2013-10-31 12:08:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 15:47:41 -0700 |
| commit | f8c872127d4c48a6ec02abce34cb059ddeb6402a (patch) | |
| tree | 6667fb8cefbabb17ae4fa670a4ea882932fe8d65 /builtin | |
| parent | b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0 (diff) | |
| download | git-f8c872127d4c48a6ec02abce34cb059ddeb6402a.tar.gz | |
rev-parse --parseopt: add the --stuck-long modenv/parseopt-opt-arg
Add the --stuck-long option to output the options in their long form
if available, and with their arguments stuck.
Contrary to the default form (non stuck arguments and short options),
this can be parsed unambiguously when using options with optional
arguments :
- in the non stuck form, when an option is taking an optional argument
you cannot know if the next argument is its optional argument, or the
next option.
- the long options form allows to differentiate between an empty argument
'--option=' and an unset argument '--option', which is not possible
with short options.
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-parse.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index c76b89dc5b..3e8c4cce06 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -30,6 +30,8 @@ static int abbrev_ref; static int abbrev_ref_strict; static int output_sq; +static int stuck_long; + /* * Some arguments are relevant "revision" arguments, * others are about output format or other details. @@ -320,12 +322,15 @@ static int parseopt_dump(const struct option *o, const char *arg, int unset) struct strbuf *parsed = o->value; if (unset) strbuf_addf(parsed, " --no-%s", o->long_name); - else if (o->short_name) + else if (o->short_name && (o->long_name == NULL || !stuck_long)) strbuf_addf(parsed, " -%c", o->short_name); else strbuf_addf(parsed, " --%s", o->long_name); if (arg) { - strbuf_addch(parsed, ' '); + if (!stuck_long) + strbuf_addch(parsed, ' '); + else if (o->long_name) + strbuf_addch(parsed, '='); sq_quote_buf(parsed, arg); } return 0; @@ -351,6 +356,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "stop-at-non-option", &stop_at_non_option, N_("stop parsing after the " "first non-option argument")), + OPT_BOOL(0, "stuck-long", &stuck_long, + N_("output in stuck long form")), OPT_END(), }; |