From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Lars Hjemli <hjemli@gmail.com>,
Christian Couder <christian.couder@gmail.com>
Subject: Re: [PATCH 0/4] fix object flag pollution in "tag --contains"
Date: Sat, 11 Mar 2017 14:06:55 +0100 [thread overview]
Message-ID: <CACBZZX5rgomtp3E6JkZdyJPY_iw=j+Sg3-nYw-05jW0raRvK0w@mail.gmail.com> (raw)
In-Reply-To: <20170309132728.c57ltzel746l366a@sigill.intra.peff.net>
On Thu, Mar 9, 2017 at 2:27 PM, Jeff King <peff@peff.net> wrote:
> On Thu, Mar 09, 2017 at 07:51:32AM -0500, Jeff King wrote:
>
>> Looking at this, I'm pretty sure that using "--contains" with "--merged"
>> has similar problems, as they both use the UNINTERESTING bit. So even
>> without your patch, there is a lurking bug.
Sorry about the late reply. Been a while since I was active on the git
ML, and my broken list search was searching for cc:me, not to:me. So I
sent my v3 in <20170310203348.675-1-avarab@gmail.com> without reading
this.
> I wasn't able to come up with a simple case that actually demonstrates
> the bug. But I feel like it has to be triggerable with the right
> sequence of history.
The tag brute force script I hacked up
(https://gist.github.com/avar/45cf288ce7cdc43e7395c6cbf9a98d68) is now
at >1k iterations without finding anything. But of course it may be
broken / this may not be producible on git.git
> Even without that, though, I feel like moving away from this flag usage
> is a good cleanup. Here's a cleaned-up series. What do you think of
> building your patch on top?
>
> We can do it the other way around if you prefer.
Getting this in master first sounds good. I already have a working v4
on top of this, which is of course much faster for the --contains
combined with --no-contains case. Gotta run now, but will clean up
that patch & submit it to the list soon.
> [1/4]: ref-filter: move ref_cbdata definition into ref-filter.c
> [2/4]: ref-filter: use contains_result enum consistently
> [3/4]: ref-filter: die on parse_commit errors
> [4/4]: ref-filter: use separate cache for contains_tag_algo
>
> ref-filter.c | 70 ++++++++++++++++++++++++++++++++++++++----------------------
> ref-filter.h | 5 -----
> 2 files changed, 44 insertions(+), 31 deletions(-)
>
> -Peff
next prev parent reply other threads:[~2017-03-11 13:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 20:20 [PATCH] branch & tag: Add a --no-contains option Ævar Arnfjörð Bjarmason
2017-03-08 23:02 ` Junio C Hamano
2017-03-09 10:09 ` Jeff King
2017-03-09 10:41 ` Ævar Arnfjörð Bjarmason
2017-03-09 10:46 ` Jeff King
2017-03-09 12:12 ` Ævar Arnfjörð Bjarmason
2017-03-09 12:51 ` Jeff King
2017-03-09 13:27 ` [PATCH 0/4] fix object flag pollution in "tag --contains" Jeff King
2017-03-09 13:27 ` [PATCH 1/4] ref-filter: move ref_cbdata definition into ref-filter.c Jeff King
2017-03-09 13:28 ` [PATCH 2/4] ref-filter: use contains_result enum consistently Jeff King
2017-03-09 13:29 ` [PATCH 3/4] ref-filter: die on parse_commit errors Jeff King
2017-03-09 13:29 ` [PATCH 4/4] ref-filter: use separate cache for contains_tag_algo Jeff King
2017-03-11 20:01 ` Ævar Arnfjörð Bjarmason
2017-03-11 20:21 ` Ævar Arnfjörð Bjarmason
2017-03-12 11:12 ` Jeff King
2017-03-11 13:06 ` Ævar Arnfjörð Bjarmason [this message]
2017-03-11 20:18 ` [PATCH v4] ref-filter: Add --no-contains option to tag/branch/for-each-ref Ævar Arnfjörð Bjarmason
2017-03-12 4:44 ` Junio C Hamano
2017-03-12 9:10 ` Ævar Arnfjörð Bjarmason
2017-03-12 17:49 ` Junio C Hamano
2017-03-09 14:52 ` [PATCH] branch & tag: Add a --no-contains option Ævar Arnfjörð Bjarmason
2017-03-09 14:55 ` Jeff King
2017-03-10 11:31 ` Ævar Arnfjörð Bjarmason
2017-03-09 20:02 ` [PATCH v2] ref-filter: Add --no-contains option to tag/branch/for-each-ref Ævar Arnfjörð Bjarmason
2017-03-09 20:31 ` Christian Couder
2017-03-10 11:46 ` Ævar Arnfjörð Bjarmason
2017-03-10 12:09 ` Ævar Arnfjörð Bjarmason
2017-03-10 20:33 ` [PATCH v3] " Ævar Arnfjörð Bjarmason
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='CACBZZX5rgomtp3E6JkZdyJPY_iw=j+Sg3-nYw-05jW0raRvK0w@mail.gmail.com' \
--to=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hjemli@gmail.com \
--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).