From: Aaron Lipman <alipman88@gmail.com>
To: git@vger.kernel.org
Cc: Aaron Lipman <alipman88@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 0/3] git branch: allow combining merged and no-merged filters
Date: Sun, 13 Sep 2020 15:31:37 -0400 [thread overview]
Message-ID: <20200913193140.66906-1-alipman88@gmail.com> (raw)
In-Reply-To: <20200911185754.64173-3-alipman88@gmail.com>
> It is a bit sad that this only removes from documentation without
> adding (the removal is because merged and no-merged are no longer
> mutually exclusive)...
>
> Perhaps --contains side can already be combined so they have
> description we can borrow here? I didn't look too carefully.
Sounds good, I've added documentation covering both multiple contains/
no-contains and merged/no-merged filters to the notes sections of the
doc files for branch, for-each-ref & tag. (There was no existing
documentation for --contains, so I added that in commit 2/3.)
> We do not allow decl-after-statement.
Got it, fixed both locations.
> I would have expected, instead of placing the
> single object to the pending queue, the loop places all the filter
> objects in a queue, and then makes a limited revision walk just
> once. In general, each time after the code makes a call to
> prepare_revision_walk() to perform a revision walk, before doing so
> again, the object flags used for the walking must be cleared.
Thanks for the explanation - updated accordingly. I'll plan on
studying that code as part of better familiarizing myself with
git's codebase.
Aaron Lipman (3):
t3201: test multiple branch filter combinations
Doc: cover multiple contains/no-contains filters
ref-filter: allow merged and no-merged filters
Documentation/git-branch.txt | 17 +++++---
Documentation/git-for-each-ref.txt | 20 ++++++---
Documentation/git-tag.txt | 17 ++++++--
builtin/branch.c | 6 +--
builtin/for-each-ref.c | 2 +-
builtin/tag.c | 8 ++--
ref-filter.c | 64 ++++++++++++++-------------
ref-filter.h | 9 +---
t/t3200-branch.sh | 4 +-
t/t3201-branch-contains.sh | 69 ++++++++++++++++++++++++++++--
t/t6302-for-each-ref-filter.sh | 4 +-
t/t7004-tag.sh | 2 +-
12 files changed, 157 insertions(+), 65 deletions(-)
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2020-09-13 19:32 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 15:37 [PATCH] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-08 22:46 ` Junio C Hamano
2020-09-08 23:57 ` Aaron Lipman
2020-09-09 0:00 ` Junio C Hamano
2020-09-11 18:57 ` [PATCH v2 0/2] git branch: allow combining " Aaron Lipman
2020-09-11 18:57 ` [PATCH v2 1/2] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-11 18:57 ` [PATCH v2 2/2] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-11 21:47 ` Junio C Hamano
2020-09-13 19:31 ` Aaron Lipman [this message]
2020-09-13 19:31 ` [PATCH v3 1/3] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-13 20:58 ` Eric Sunshine
2020-09-14 20:07 ` Junio C Hamano
2020-09-13 19:31 ` [PATCH v3 2/3] Doc: cover multiple contains/no-contains filters Aaron Lipman
2020-09-13 21:10 ` Eric Sunshine
2020-09-14 20:07 ` Junio C Hamano
2020-09-13 19:31 ` [PATCH v3 3/3] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-13 21:36 ` Eric Sunshine
2020-09-13 21:56 ` Junio C Hamano
2020-09-13 22:31 ` Eric Sunshine
2020-09-16 2:08 ` [PATCH v4 0/3] git branch: allow combining " Aaron Lipman
2020-09-16 2:08 ` [PATCH v4 1/3] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-16 2:08 ` [PATCH v4 2/3] Doc: cover multiple contains/no-contains filters Aaron Lipman
2020-09-16 19:45 ` Junio C Hamano
2020-09-16 2:08 ` [PATCH v4 3/3] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-16 4:53 ` [PATCH v4 0/3] git branch: allow combining " Junio C Hamano
2020-09-16 5:08 ` Eric Sunshine
2020-09-18 0:49 ` [PATCH 0/2] ref-filter: merged & no-merged touch-ups Aaron Lipman
2020-09-18 0:49 ` [PATCH 1/2] ref-filter: refactor do_merge_filter() Aaron Lipman
2020-09-18 5:03 ` Eric Sunshine
2020-09-18 5:04 ` Eric Sunshine
2020-09-18 17:01 ` Junio C Hamano
2020-09-18 0:49 ` [PATCH 2/2] Doc: prefer more specific file name Aaron Lipman
2020-09-18 2:52 ` [PATCH 0/2] ref-filter: merged & no-merged touch-ups Eric Sunshine
2020-09-18 21:58 ` [PATCH v2 " Aaron Lipman
2020-09-18 21:58 ` [PATCH v2 1/2] ref-filter: make internal reachable-filter API more precise Aaron Lipman
2020-09-18 21:58 ` [PATCH v2 2/2] Doc: prefer more specific file name Aaron Lipman
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=20200913193140.66906-1-alipman88@gmail.com \
--to=alipman88@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).