diff options
| author | Aaron Lipman <alipman88@gmail.com> | 2020-09-16 04:08:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-16 21:38:10 +0200 |
| commit | 21bf933928c02372633b88aa6c4d9d71271d42b3 (patch) | |
| tree | e2ad37586b8eef4cb8bee34ff495ed4d7aed0c46 /t/t3200-branch.sh | |
| parent | Doc: cover multiple contains/no-contains filters (diff) | |
| download | git-21bf933928c02372633b88aa6c4d9d71271d42b3.tar.xz git-21bf933928c02372633b88aa6c4d9d71271d42b3.zip | |
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/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 4c0734157b..bf3c3a33ba 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1298,10 +1298,6 @@ test_expect_success '--merged catches invalid object names' ' test_must_fail git branch --merged 0000000000000000000000000000000000000000 ' -test_expect_success '--merged is incompatible with --no-merged' ' - test_must_fail git branch --merged HEAD --no-merged HEAD -' - test_expect_success '--list during rebase' ' test_when_finished "reset_rebase" && git checkout master && |