git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Lars Hjemli <hjemli@gmail.com>,
	Jeff King <peff@peff.net>,
	Christian Couder <christian.couder@gmail.com>,
	Carlos Rica <jasampler@gmail.com>,
	Samuel Tardieu <sam@rfc1149.net>,
	Tom Grennan <tmgrennan@gmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH v3 09/16] tag: add more incompatibles mode tests
Date: Thu, 23 Mar 2017 10:13:59 -0700	[thread overview]
Message-ID: <xmqqtw6jex0o.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170323130529.11361-10-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Thu, 23 Mar 2017 13:05:22 +0000")

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> 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?  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.

would be easier to understand, I would think.

> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  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 &&

  reply	other threads:[~2017-03-23 17:14 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-23 13:05 [PATCH v3 00/16] Various changes to the "tag" command & related Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 01/16] tag doc: move the description of --[no-]merged earlier Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 02/16] tag doc: split up the --[no-]merged documentation Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 03/16] tag doc: reword --[no-]merged to talk about commits, not tips Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 04/16] ref-filter: make combining --merged & --no-merged an error Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 05/16] ref-filter: add test for --contains on a non-commit Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 06/16] tag: remove a TODO item from the test suite Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 07/16] tag tests: fix a typo in a test description Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 08/16] for-each-ref: partly change <object> to <commit> in help Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 09/16] tag: add more incompatibles mode tests Ævar Arnfjörð Bjarmason
2017-03-23 17:13   ` Junio C Hamano [this message]
2017-03-23 20:37     ` Ævar Arnfjörð Bjarmason
2017-03-23 21:36       ` Junio C Hamano
2017-03-23 22:13         ` Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 10/16] parse-options: add OPT_NONEG to the "contains" option Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 11/16] tag: change misleading --list <pattern> documentation Ævar Arnfjörð Bjarmason
2017-03-23 17:16   ` Junio C Hamano
2017-03-23 13:05 ` [PATCH v3 12/16] tag: implicitly supply --list given another list-like option Ævar Arnfjörð Bjarmason
2017-03-23 17:29   ` Junio C Hamano
2017-03-23 20:32     ` Ævar Arnfjörð Bjarmason
2017-03-23 21:33       ` Junio C Hamano
2017-03-23 13:05 ` [PATCH v3 13/16] tag: change --point-at to default to HEAD Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 14/16] ref-filter: add --no-contains option to tag/branch/for-each-ref Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 15/16] ref-filter: reflow recently changed branch/tag/for-each-ref docs Ævar Arnfjörð Bjarmason
2017-03-23 13:05 ` [PATCH v3 16/16] tag: add tests for --with and --without Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtw6jex0o.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=hjemli@gmail.com \
    --cc=jasampler@gmail.com \
    --cc=karthik.188@gmail.com \
    --cc=peff@peff.net \
    --cc=sam@rfc1149.net \
    --cc=tmgrennan@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).