diff options
author | Aaron Lipman <alipman88@gmail.com> | 2020-09-16 05:08:40 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-16 22:38:10 +0300 |
commit | 21bf933928c02372633b88aa6c4d9d71271d42b3 (patch) | |
tree | e2ad37586b8eef4cb8bee34ff495ed4d7aed0c46 /t/t6302-for-each-ref-filter.sh | |
parent | 415af72b174802a45300039ef2bc1127d48dc0c0 (diff) |
ref-filter: allow merged and no-merged filters
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 --no-merged master --merged next
If passed more than one merged (or more than one no-merged) filter, refs
must be reachable from any one of the merged commits, and reachable from
none of the no-merged commits.
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6302-for-each-ref-filter.sh')
-rwxr-xr-x | t/t6302-for-each-ref-filter.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index 35408d53fd..781e470aea 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -437,8 +437,8 @@ test_expect_success 'check %(if:notequals=<string>)' ' test_cmp expect actual ' -test_expect_success '--merged is incompatible with --no-merged' ' - test_must_fail git for-each-ref --merged HEAD --no-merged HEAD +test_expect_success '--merged is compatible with --no-merged' ' + git for-each-ref --merged HEAD --no-merged HEAD ' test_expect_success 'validate worktree atom' ' |