summaryrefslogtreecommitdiff
path: root/t/t7004-tag.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-03-24 18:40:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-24 19:15:26 (GMT)
commit75057691beb804e804df21992ae55d50ffc36f92 (patch)
treea127615696e633a610d35054cc32c77e99fd5280 /t/t7004-tag.sh
parent783b829287952ec42bf89d9ca42fc6c51d7d0143 (diff)
downloadgit-75057691beb804e804df21992ae55d50ffc36f92.zip
git-75057691beb804e804df21992ae55d50ffc36f92.tar.gz
git-75057691beb804e804df21992ae55d50ffc36f92.tar.bz2
tag: add tests for --with and --without
Change the test suite to test for these synonyms for --contains and --no-contains, respectively. Before this change there were no tests for them at all. This doesn't exhaustively test for them as well as their --contains and --no-contains synonyms, but at least it's something. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7004-tag.sh')
-rwxr-xr-xt/t7004-tag.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 8a6e803..6143113 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1599,10 +1599,12 @@ test_expect_success 'mixing incompatibles modes and options is forbidden' '
test_must_fail git tag --contains tag-blob &&
test_must_fail git tag --no-contains tag-tree &&
test_must_fail git tag --no-contains tag-blob &&
- test_must_fail git tag --contains --no-contains
+ test_must_fail git tag --contains --no-contains &&
+ test_must_fail git tag --no-with HEAD &&
+ test_must_fail git tag --no-without HEAD
'
-for option in --contains --no-contains --merged --no-merged --points-at
+for option in --contains --with --no-contains --without --merged --no-merged --points-at
do
test_expect_success "mixing incompatible modes with $option is forbidden" "
test_must_fail git tag -d $option HEAD &&