On Thu, Mar 23, 2017 at 6:13 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > >> Amend the test suite to test for more invalid uses like "-l -a" >> etc. This change tests this code path in builtin/tag.c: >> >> `(argc == 0 && !cmdmode)` >> -> >> `((create_tag_object || force) && (cmdmode != 0))` > > What is this notation trying to tell us? A range of lines starting > with the first one to the second one? Yeah. > If so perhaps > > Add tests to detect more invalid combinations like "-a -l", > to test code that defaults to the list mode when no other > conflicting options are given and that detects conflicting > requests. I think the only people who'll ever dig up this commit is someone trying to figure out why one of these invocations dies after 'git blame'-ing this code. Surely it'll be more useful to them to see what specific code this was aiming to test, rather than having more vague prose like that... > would be easier to understand, I would think. > >> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> >> --- >> t/t7004-tag.sh | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh >> index 63ee2cf727..92af8bb7e6 100755 >> --- 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_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 -d && >> + test_must_fail git tag -l -v -d && >> 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 &&