From: "Martin Ågren" <martin.agren@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] diff: allow --recurse-submodules as an synonym for --submodule
Date: Thu, 6 Sep 2018 08:19:05 +0200 [thread overview]
Message-ID: <CAN0heSpOG8c5En_YVvtkcwBmOrnS72cTXSw9YRJP4FG-M8dWag@mail.gmail.com> (raw)
In-Reply-To: <20180905225828.17782-1-sbeller@google.com>
On Thu, 6 Sep 2018 at 00:59, Stefan Beller <sbeller@google.com> wrote:
>
> --submodule[=<format>]::
Maybe drop `--submodule` here ...
> +--recurse-submodules[=<format>]::
> Specify how differences in submodules are shown. When specifying
> `--submodule=short` the 'short' format is used. This format just
... and use `--recurse-submodules` here ...
> shows the names of the commits at the beginning and end of the range.
... and mention `--submodule` here as a historical alias? Maybe
deprecate it? I suppose the implementation of the aliasing is easy
enough that we can carry `--submodule` around forever, though.
> 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);
How about (whitespace-damaged)
} else if (skip_to_optional_arg_default(arg, "--submodule", &arg, "log") ||
skip_to_optional_arg_default(arg, "--recurse-submodules",
&arg, "log"))
return parse_submodule_opt(options, arg);
to make this future-proof? Sure, they're close enough that one should
notice the two instances, and any future work work would supposedly
happen in `parse_submodule_opt()` or anywhere else but here, but still.
Just a few thoughts.
Martin
next prev parent reply other threads:[~2018-09-06 6:19 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
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 [this message]
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
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=CAN0heSpOG8c5En_YVvtkcwBmOrnS72cTXSw9YRJP4FG-M8dWag@mail.gmail.com \
--to=martin.agren@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.
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).