Re: [PATCH 3/3] rev-parse: simplify parsing of ref options
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 15, 2017, 21:09 UTC
- Message-ID
- <xmqq8to6dz76.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170315200802.r4un6p5admfu4h34@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> This actually drops the last caller for for_each_branch_ref(). I'm not > sure if we shoulder consider cleaning up the proliferation of > for_each_ref() helpers.
That is certainly a good thing to do (but outside this series).
I am wondering if "git diff" could have chosen a better way to arrange deleted and inserted lines. The first two if statements in the preimage corresponds to the new opt-with-value(branches) thing, the next two are repalced by opt-with-value(tags), an odd-man-out "--glob=" thing is replaced with handle_ref_opt(NULL), and then two "--remotes" thing are paired with the final opt-with-value(remotes) thing.
That would break the usual expectation of seeing all "-" first and then "+" when there is no intervening " " context lines, so such an output might break tools, though (I do not think "git apply" would choke).
Show 73 quoted lines
> builtin/rev-parse.c | 45 ++++++++++++++++-----------------------------
> 1 file changed, 16 insertions(+), 29 deletions(-)
>
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index db1417160..76be91350 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -554,6 +554,15 @@ static int opt_with_value(const char *arg, const char *opt, const char **value)
> return 0;
> }
>
> +static void handle_ref_opt(const char *pattern, const char *prefix)
> +{
> + if (pattern)
> + for_each_glob_ref_in(show_reference, pattern, prefix, NULL);
> + else
> + for_each_ref_in(prefix, show_reference, NULL);
> + clear_ref_exclusion(&ref_excludes);
> +}
> +
> int cmd_rev_parse(int argc, const char **argv, const char *prefix)
> {
> int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
> @@ -749,42 +758,20 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
> for_each_ref_in("refs/bisect/good", anti_reference, NULL);
> continue;
> }
> - if (skip_prefix(arg, "--branches=", &arg)) {
> - for_each_glob_ref_in(show_reference, arg,
> - "refs/heads/", NULL);
> - clear_ref_exclusion(&ref_excludes);
> - continue;
> - }
> - if (!strcmp(arg, "--branches")) {
> - for_each_branch_ref(show_reference, NULL);
> - clear_ref_exclusion(&ref_excludes);
> - continue;
> - }
> - if (skip_prefix(arg, "--tags=", &arg)) {
> - for_each_glob_ref_in(show_reference, arg,
> - "refs/tags/", NULL);
> - clear_ref_exclusion(&ref_excludes);
> + if (opt_with_value(arg, "--branches", &arg)) {
> + handle_ref_opt(arg, "refs/heads/");
> continue;
> }
> - if (!strcmp(arg, "--tags")) {
> - for_each_tag_ref(show_reference, NULL);
> - clear_ref_exclusion(&ref_excludes);
> + if (opt_with_value(arg, "--tags", &arg)) {
> + handle_ref_opt(arg, "refs/tags/");
> continue;
> }
> if (skip_prefix(arg, "--glob=", &arg)) {
> - for_each_glob_ref(show_reference, arg, NULL);
> - clear_ref_exclusion(&ref_excludes);
> - continue;
> - }
> - if (skip_prefix(arg, "--remotes=", &arg)) {
> - for_each_glob_ref_in(show_reference, arg,
> - "refs/remotes/", NULL);
> - clear_ref_exclusion(&ref_excludes);
> + handle_ref_opt(arg, NULL);
> continue;
> }
> - if (!strcmp(arg, "--remotes")) {
> - for_each_remote_ref(show_reference, NULL);
> - clear_ref_exclusion(&ref_excludes);
> + if (opt_with_value(arg, "--remotes", &arg)) {
> + handle_ref_opt(arg, "refs/remotes/");
> continue;
> }
> if (skip_prefix(arg, "--exclude=", &arg)) {