tag: add more incompatibles mode tests

Amend the test suite to test for more invalid uses like "-l -a"
etc.

This change tests the code path in builtin/tag.c between lines:

if (argc == 0 && !cmdmode)

And:

if ((create_tag_object || force) && (cmdmode != 0))

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 63ee2cf727dd98af298137e9f653bbd5037ee5cc..92af8bb7e6e6194286f0eff96a57ec3245e496a0 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1455,8 +1455,24 @@ test_expect_success 'checking that initial commit is in all tags' "
 
 test_expect_success 'mixing incompatibles modes and options is forbidden' '
        test_must_fail git tag -a &&
 
 test_expect_success 'mixing incompatibles modes and options is forbidden' '
        test_must_fail git tag -a &&

+       test_must_fail git tag -a -l &&
+       test_must_fail git tag -s &&
+       test_must_fail git tag -s -l &&
+       test_must_fail git tag -m &&
+       test_must_fail git tag -m -l &&
+       test_must_fail git tag -m "hlagh" &&
+       test_must_fail git tag -m "hlagh" -l &&
+       test_must_fail git tag -F &&
+       test_must_fail git tag -F -l &&
+       test_must_fail git tag -f &&
+       test_must_fail git tag -f -l &&
+       test_must_fail git tag -a -s -m -F &&
+       test_must_fail git tag -a -s -m -F -l &&

        test_must_fail git tag -l -v &&
        test_must_fail git tag -l -v &&

+       test_must_fail git tag -l -d &&
+       test_must_fail git tag -l -v -d &&

        test_must_fail git tag -n 100 &&
        test_must_fail git tag -n 100 &&

+       test_must_fail git tag -n 100 -v &&

        test_must_fail git tag -l -m msg &&
        test_must_fail git tag -l -F some file &&
        test_must_fail git tag -v -s &&
        test_must_fail git tag -l -m msg &&
        test_must_fail git tag -l -F some file &&
        test_must_fail git tag -v -s &&