From: Jonathan Nieder <jrnieder@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff: allow --recurse-submodules as an synonym for --submodule
Date: Wed, 5 Sep 2018 16:12:58 -0700 [thread overview]
Message-ID: <20180905231258.GD120842@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20180905225828.17782-1-sbeller@google.com>
Stefan Beller wrote:
> Many commands have flags to recurse into submodules, which is named
> --recurse-submodules. The diff family also has a submodule recursion flag,
> but that is named differently. Add a synonym --recurse-submodules, which
> means the same as the --submodule flag, such that across all git commands
> supporting submodules we have the --recurse-submodules flag available.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> Documentation/diff-options.txt | 1 +
> diff.c | 2 ++
> 2 files changed, 3 insertions(+)
Makes sense.
[...]
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -227,6 +227,7 @@ linkgit:git-config[1]).
> of the `--diff-filter` option on what the status letters mean.
>
> --submodule[=<format>]::
> +--recurse-submodules[=<format>]::
> Specify how differences in submodules are shown. When specifying
> `--submodule=short` the 'short' format is used. This format just
> shows the names of the commits at the beginning and end of the range.
> diff --git a/diff.c b/diff.c
> index 145cfbae592..d3d5a989bd1 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -5023,6 +5023,8 @@ int diff_opt_parse(struct diff_options *options,
> handle_ignore_submodules_arg(options, arg);
> } else if (skip_to_optional_arg_default(arg, "--submodule", &arg, "log"))
> return parse_submodule_opt(options, arg);
> + else if (skip_to_optional_arg_default(arg, "--recurse-submodules", &arg, "log"))
> + return parse_submodule_opt(options, arg);
It seems like various commands are gaining --recurse-submodules options
taking different kinds of arguments:
- clone takes --recurse-submodules=<pathspec>
- fetch takes --recurse-submodules=<mode>
- after this patch, diff takes --recurse-submodules=<mode>
Is there a unifying principle? Can Documentation/gitsubmodules.txt
say a word or two about what kind of argument values the user should
expect to be accepted by these options?
Thanks,
Jonathan
next prev parent reply other threads:[~2018-09-05 23:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 22:58 [PATCH] diff: allow --recurse-submodules as an synonym for --submodule Stefan Beller
2018-09-05 23:12 ` Jonathan Nieder [this message]
2018-09-06 18:27 ` Stefan Beller
2018-09-06 21:12 ` Junio C Hamano
2018-09-06 21:25 ` Stefan Beller
2018-09-07 6:40 ` Jonathan Nieder
2018-09-07 9:53 ` Junio C Hamano
2018-09-06 6:19 ` Martin Ågren
2018-09-06 18:23 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180905231258.GD120842@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.