diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:31 +0300 |
| commit | 26a3728bedbdf75c670e21d24f6a30e4673f8d19 (patch) | |
| tree | 2cb960e05c264e7011e0dddf33694fedb857031f /t/t3200-branch.sh | |
| parent | 4d515253afcef985e94400adbfed7044959f9121 (diff) | |
| parent | b59cdffd7e3d791ee289ebb46d7109ad3d51d7ea (diff) | |
Merge branch 'al/ref-filter-merged-and-no-merged'
"git for-each-ref" and friends that list refs used to allow only
one --merged or --no-merged to filter them; they learned to take
combination of both kind of filtering.
* al/ref-filter-merged-and-no-merged:
Doc: prefer more specific file name
ref-filter: make internal reachable-filter API more precise
ref-filter: allow merged and no-merged filters
Doc: cover multiple contains/no-contains filters
t3201: test multiple branch filter combinations
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 028c88d1b2..c24c6632ee 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1299,10 +1299,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 && |