From: Jeff King <peff@peff.net>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Andrew White <andrew.white@audinate.com>
Subject: Re: [PATCH] push: unset PARSE_OPT_OPTARG for --recurse-submodules
Date: Mon, 27 Apr 2020 08:02:25 -0400 [thread overview]
Message-ID: <20200427120225.GB1718141@coredump.intra.peff.net> (raw)
In-Reply-To: <c2b92691ca85029fde3bd6969252cc827ca697b5.1587969824.git.liu.denton@gmail.com>
On Mon, Apr 27, 2020 at 02:44:08AM -0400, Denton Liu wrote:
> When the usage for `git push` is shown, it includes the following
> lines
>
> --recurse-submodules[=(check|on-demand|no)]
> control recursive pushing of submodules
>
> which seem to indicate that the argument for --recurse-submodules is
> optional. However, we cannot actually run that optiion without an
> argument:
>
> $ git push --recurse-submodules
> fatal: recurse-submodules missing parameter
>
> Unset PARSE_OPT_OPTARG so that it is clear that this option requires an
> argument. Since the parse-options machinery guarantees that an argument
> is present now, assume that `arg` is set in the else of
> option_parse_recurse_submodules().
Yeah, I think this is the right solution. It looks like it was broken
since the option was introduced in d2b17b3220 (push: Don't push a
repository with unpushed submodules, 2011-08-20).
I wondered if it was copied from another similar option in another
command, and if so whether that option had the same problem. But it
doesn't look like it. The other --recurse-submodules options are all
PARSE_OPT_OPTARG, but they actually do something useful when they are
not given an option (they turn it to "on").
I don't know enough about the "push" case to say whether it would be a
good idea for it to behave similarly, but certainly your patch is an
improvement until somebody decides to look into it.
> diff --git a/builtin/push.c b/builtin/push.c
> index 6dbf0f0bb7..90f071fcf2 100644
> --- a/builtin/push.c
> +++ b/builtin/push.c
> @@ -434,10 +434,8 @@ static int option_parse_recurse_submodules(const struct option *opt,
>
> if (unset)
> *recurse_submodules = RECURSE_SUBMODULES_OFF;
> - else if (arg)
> - *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
> else
> - die("%s missing parameter", opt->long_name);
> + *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
What a lousy diff. It would be much easier to read if we chose to
replace the "else" and keep the big complicated line intact. :)
Both Myers and --histogram give the diff above, but --patience gives:
diff --git a/builtin/push.c b/builtin/push.c
index 6dbf0f0bb7..ac6cc07c8c 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -434,10 +434,8 @@ static int option_parse_recurse_submodules(const struct option *opt,
if (unset)
*recurse_submodules = RECURSE_SUBMODULES_OFF;
- else if (arg)
+ else
*recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
- else
- die("%s missing parameter", opt->long_name);
return 0;
}
Obviously not a complaint about your patch. I'm always just curious to
see cases where the various diff implementations do better or worse than
each other.
> @@ -554,7 +552,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
> PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option },
> { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
> N_("control recursive pushing of submodules"),
> - PARSE_OPT_OPTARG, option_parse_recurse_submodules },
> + 0, option_parse_recurse_submodules },
This could collapse down to OPT_CALLBACK() now, though I don't think
it's a big deal either way.
-Peff
next prev parent reply other threads:[~2020-04-27 12:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 1:31 Bug v2.23.0: command help for 'git push --recurse-submodules' is incorrect Andrew White
2020-04-27 6:44 ` [PATCH] push: unset PARSE_OPT_OPTARG for --recurse-submodules Denton Liu
2020-04-27 12:02 ` Jeff King [this message]
2020-04-27 18:54 ` Junio C Hamano
2020-04-28 8:36 ` [PATCH] Use OPT_CALLBACK and OPT_CALLBACK_F Denton Liu
2020-04-28 8:45 ` Jeff King
2020-04-28 17:34 ` Junio C Hamano
2020-04-28 17:51 ` [PATCH] push: unset PARSE_OPT_OPTARG for --recurse-submodules Junio C Hamano
2020-04-28 22:59 ` Denton Liu
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=20200427120225.GB1718141@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=andrew.white@audinate.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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).