From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Andreas Gruenbacher <agruenba@redhat.com>, git@vger.kernel.org
Subject: Re: [PATCH] Clear --exclude list after 'git rev-parse --all'
Date: Sat, 27 Oct 2018 16:12:40 +0900 [thread overview]
Message-ID: <xmqq5zxnc17b.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181026074638.GA3119@sigill.intra.peff.net> (Jeff King's message of "Fri, 26 Oct 2018 03:46:38 -0400")
Jeff King <peff@peff.net> writes:
>> I actually was hoping to see a test that contrasts "--all" (which
>> lacks the alleged "clear exclude" bug) with another option that does
>> have the "clear exclude", both used with rev-parse, i.e.
>>
>> $ git rev-parse --exclude='*' --glob='*' --glob='*'
>> ... all the ref tips ...
>> $ git rev-parse --exclude='*' --all --all
>> ... ought to be equivalent, but is empty due to the bug ...
>>
>> would have been a good demonstration that shows what bug we are
>> fixing d(and would have been a good test to accompany the patch.
>
> Yeah, I agree that would be fine, too. I think there are two dimensions
> in which to look at the problem, like so:
>
> rev-list rev-parse
> -------- ---------
> --glob clears clears
> --all clears does not clear
>
> Testing either the row or the column (or both) works for me. :)
OK, so let's not leave this loose end untied. This may be good
enough to squash in.
builtin/rev-parse.c | 1 -
t/t6018-rev-list-glob.sh | 12 ++++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index f4847d3008..a1e680b5e9 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -760,7 +760,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "--all")) {
for_each_ref(show_reference, NULL);
- clear_ref_exclusion(&ref_excludes);
continue;
}
if (skip_prefix(arg, "--disambiguate=", &arg)) {
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index d3453c583c..b28075b65d 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -141,6 +141,18 @@ test_expect_success 'rev-parse accumulates multiple --exclude' '
compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
'
+test_expect_success 'rev-parse --branches clears --exclude' '
+ compare rev-parse "--exclude=* --branches --branches" "--branches"
+'
+
+test_expect_success 'rev-parse --tags clears --exclude' '
+ compare rev-parse "--exclude=* --tags --tags" "--tags"
+'
+
+test_expect_success 'rev-parse --all clears --exclude' '
+ compare rev-parse "--exclude=* --all --all" "--all"
+'
+
test_expect_success 'rev-list --glob=refs/heads/subspace/*' '
compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
next prev parent reply other threads:[~2018-10-27 7:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-23 19:17 [PATCH] Clear --exclude list after 'git rev-parse --all' Andreas Gruenbacher
2018-10-24 4:35 ` Junio C Hamano
2018-10-24 9:01 ` Andreas Gruenbacher
2018-10-24 9:24 ` Junio C Hamano
2018-10-24 9:49 ` Andreas Gruenbacher
2018-10-25 10:45 ` Jeff King
2018-10-25 23:43 ` Junio C Hamano
2018-10-26 7:46 ` Jeff King
2018-10-27 7:12 ` Junio C Hamano [this message]
2018-10-27 7:20 ` Jeff King
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=xmqq5zxnc17b.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=agruenba@redhat.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).