mbox series

[v2,0/2] git branch: allow combining merged and no-merged filters

Message ID 20200911185754.64173-1-alipman88@gmail.com (mailing list archive)
Headers show
Series git branch: allow combining merged and no-merged filters | expand

Message

Aaron Lipman Sept. 11, 2020, 6:57 p.m. UTC
Enable ref-filter to process multiple merged and no-merged filters,
and extend functionality to git branch, git tag and git
for-each-ref. This provides an easy way to check for branches that
are "graduation candidates:"

$ git branch --merged next --no-merged master

Currently, this required a command like:

$ grep -xf \
  <(git branch --merged next) \
  <(git branch --no-merged master)

Also, add tests describing git branch's behavior when combining
multiple contains/no-contains filters - this helps demonstrate
consistency between merged/no-merged and contains/no-contains.

Aaron Lipman (2):
  t3201: test multiple branch filter combinations
  ref-filter: allow merged and no-merged filters

 Documentation/git-branch.txt       |  6 +--
 Documentation/git-for-each-ref.txt |  6 +--
 Documentation/git-tag.txt          |  4 +-
 builtin/branch.c                   |  4 +-
 builtin/tag.c                      |  6 +--
 ref-filter.c                       | 71 ++++++++++++++++--------------
 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 +-
 11 files changed, 122 insertions(+), 63 deletions(-)