{"thread":{"id":"45964","subject":"[PATCH] tag: duplicate mention of --contains should mention --no-contains","startedAt":"2017-05-15T12:23:50Z","lastAt":"2017-05-23T09:44:14Z","messageCount":5,"participants":["Ævar Arnfjörð Bjarmason","Marc Branchaud"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"319779","messageId":"20170515122331.17348-1-avarab@gmail.com","threadId":"45964","inReplyTo":null,"subject":"[PATCH] tag: duplicate mention of --contains should mention --no-contains","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-05-15T12:23:31Z","receivedAt":"2017-05-15T12:23:50Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Fix a duplicate mention of --contains in the SYNOPSIS to mention\n--no-contains.\n\nThis fixes an error introduced in my commit ac3f5a3468 (\"ref-filter:\nadd --no-contains option to tag/branch/for-each-ref\", 2017-03-24).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n Documentation/git-tag.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex f8a0b787f4..1eb15afa1c 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]\n \t<tagname> [<commit> | <object>]\n 'git tag' -d <tagname>...\n-'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]\n+'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n \t[--points-at <object>] [--column[=<options>] | --no-column]\n \t[--create-reflog] [--sort=<key>] [--format=<format>]\n \t[--[no-]merged [<commit>]] [<pattern>...]\n-- \n2.11.0\n\n"},{"id":"319788","messageId":"28535adf-5f8f-a43d-82e9-2ada398637e2@xiplink.com","threadId":"45964","inReplyTo":"20170515122331.17348-1-avarab@gmail.com","subject":"Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains","fromName":"Marc Branchaud","fromEmail":"marcnarc@xiplink.com","sentAt":"2017-05-15T14:20:13Z","receivedAt":"2017-05-15T14:26:51Z","isPatch":true,"sender":{"key":"marcnarc@xiplink.com","avatar":"https://avatars.githubusercontent.com/u/14980203?v=4"},"body":"On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:\n> Fix a duplicate mention of --contains in the SYNOPSIS to mention\n> --no-contains.\n>\n> This fixes an error introduced in my commit ac3f5a3468 (\"ref-filter:\n> add --no-contains option to tag/branch/for-each-ref\", 2017-03-24).\n>\n> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n> ---\n>  Documentation/git-tag.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n> index f8a0b787f4..1eb15afa1c 100644\n> --- a/Documentation/git-tag.txt\n> +++ b/Documentation/git-tag.txt\n> @@ -12,7 +12,7 @@ SYNOPSIS\n>  'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]\n>  \t<tagname> [<commit> | <object>]\n>  'git tag' -d <tagname>...\n> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]\n> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n\nI think\n\n\t[--[no-]contains <commit>]\n\nis the usual pattern...\n\n>  \t[--points-at <object>] [--column[=<options>] | --no-column]\n>  \t[--create-reflog] [--sort=<key>] [--format=<format>]\n>  \t[--[no-]merged [<commit>]] [<pattern>...]\n\n... like with --[no-]merged, there.\n\n\t\tM.\n\n"},{"id":"319789","messageId":"CACBZZX4VDphESS1bt8w4A2GGCnXgj3DRwQLtC+o2ngTQz9=CZA@mail.gmail.com","threadId":"45964","inReplyTo":"28535adf-5f8f-a43d-82e9-2ada398637e2@xiplink.com","subject":"Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-05-15T15:01:07Z","receivedAt":"2017-05-15T15:01:36Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Mon, May 15, 2017 at 4:20 PM, Marc Branchaud <marcnarc@xiplink.com> wrote:\n> On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:\n>>\n>> Fix a duplicate mention of --contains in the SYNOPSIS to mention\n>> --no-contains.\n>>\n>> This fixes an error introduced in my commit ac3f5a3468 (\"ref-filter:\n>> add --no-contains option to tag/branch/for-each-ref\", 2017-03-24).\n>>\n>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n>> ---\n>>  Documentation/git-tag.txt | 2 +-\n>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n>> index f8a0b787f4..1eb15afa1c 100644\n>> --- a/Documentation/git-tag.txt\n>> +++ b/Documentation/git-tag.txt\n>> @@ -12,7 +12,7 @@ SYNOPSIS\n>>  'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]\n>>         <tagname> [<commit> | <object>]\n>>  'git tag' -d <tagname>...\n>> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]\n>> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n>\n>\n> I think\n>\n>         [--[no-]contains <commit>]\n>\n> is the usual pattern...\n>\n>>         [--points-at <object>] [--column[=<options>] | --no-column]\n>>         [--create-reflog] [--sort=<key>] [--format=<format>]\n>>         [--[no-]merged [<commit>]] [<pattern>...]\n>\n>\n> ... like with --[no-]merged, there.\n>\n>                 M.\n\nThanks for the feedback, this was discussed earlier in the series and\nwe decided on the current format I'm submitting here.\n\nSaying --[no-]merged is the convention we use for options where the\ntwo are mutually exclusive, as is the case with the --[no-]merged\noptions:\n\n    $ git tag --merged v2.12.0 --no-merged v2.13.0\n    error: option `no-merged' is incompatible with --merged\n    [...]\n\nBut in the case of --contains and --no-contains you can provide both:\n\n    $ git tag --contains v2.12.0 --no-contains v2.13.0 'v*'\n    v2.12.0\n    v2.12.1\n    v2.12.2\n    v2.12.3\n    v2.13.0-rc0\n    v2.13.0-rc1\n    v2.13.0-rc2\n\nSo they don't use that convention, since it would imply that they're\nmutually exclusive, rather than both being optional.\n"},{"id":"319794","messageId":"bf600222-757d-5b7d-7908-d08caa411eca@xiplink.com","threadId":"45964","inReplyTo":"CACBZZX4VDphESS1bt8w4A2GGCnXgj3DRwQLtC+o2ngTQz9=CZA@mail.gmail.com","subject":"Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains","fromName":"Marc Branchaud","fromEmail":"marcnarc@xiplink.com","sentAt":"2017-05-15T15:47:55Z","receivedAt":"2017-05-15T15:48:11Z","isPatch":true,"sender":{"key":"marcnarc@xiplink.com","avatar":"https://avatars.githubusercontent.com/u/14980203?v=4"},"body":"On 2017-05-15 11:01 AM, Ævar Arnfjörð Bjarmason wrote:\n> On Mon, May 15, 2017 at 4:20 PM, Marc Branchaud <marcnarc@xiplink.com> wrote:\n>> On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:\n>>>\n>>> Fix a duplicate mention of --contains in the SYNOPSIS to mention\n>>> --no-contains.\n>>>\n>>> This fixes an error introduced in my commit ac3f5a3468 (\"ref-filter:\n>>> add --no-contains option to tag/branch/for-each-ref\", 2017-03-24).\n>>>\n>>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n>>> ---\n>>>  Documentation/git-tag.txt | 2 +-\n>>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>>\n>>> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n>>> index f8a0b787f4..1eb15afa1c 100644\n>>> --- a/Documentation/git-tag.txt\n>>> +++ b/Documentation/git-tag.txt\n>>> @@ -12,7 +12,7 @@ SYNOPSIS\n>>>  'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]\n>>>         <tagname> [<commit> | <object>]\n>>>  'git tag' -d <tagname>...\n>>> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]\n>>> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n>>\n>>\n>> I think\n>>\n>>         [--[no-]contains <commit>]\n>>\n>> is the usual pattern...\n>>\n>>>         [--points-at <object>] [--column[=<options>] | --no-column]\n>>>         [--create-reflog] [--sort=<key>] [--format=<format>]\n>>>         [--[no-]merged [<commit>]] [<pattern>...]\n>>\n>>\n>> ... like with --[no-]merged, there.\n>>\n>>                 M.\n>\n> Thanks for the feedback, this was discussed earlier in the series and\n> we decided on the current format I'm submitting here.\n>\n> Saying --[no-]merged is the convention we use for options where the\n> two are mutually exclusive, as is the case with the --[no-]merged\n> options:\n>\n>     $ git tag --merged v2.12.0 --no-merged v2.13.0\n>     error: option `no-merged' is incompatible with --merged\n>     [...]\n>\n> But in the case of --contains and --no-contains you can provide both:\n>\n>     $ git tag --contains v2.12.0 --no-contains v2.13.0 'v*'\n>     v2.12.0\n>     v2.12.1\n>     v2.12.2\n>     v2.12.3\n>     v2.13.0-rc0\n>     v2.13.0-rc1\n>     v2.13.0-rc2\n>\n> So they don't use that convention, since it would imply that they're\n> mutually exclusive, rather than both being optional.\n\nAh, thanks.  My mistake!\n\n\t\tM.\n\n"},{"id":"320544","messageId":"CACBZZX5k8jiz2uz4qygdr2-gRphmeQo5fPT1b=mNxcp2REXccA@mail.gmail.com","threadId":"45964","inReplyTo":"20170515122331.17348-1-avarab@gmail.com","subject":"Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-05-23T09:43:47Z","receivedAt":"2017-05-23T09:44:14Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Mon, May 15, 2017 at 2:23 PM, Ævar Arnfjörð Bjarmason\n<avarab@gmail.com> wrote:\n> Fix a duplicate mention of --contains in the SYNOPSIS to mention\n> --no-contains.\n>\n> This fixes an error introduced in my commit ac3f5a3468 (\"ref-filter:\n> add --no-contains option to tag/branch/for-each-ref\", 2017-03-24).\n>\n> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n> ---\n>  Documentation/git-tag.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n> index f8a0b787f4..1eb15afa1c 100644\n> --- a/Documentation/git-tag.txt\n> +++ b/Documentation/git-tag.txt\n> @@ -12,7 +12,7 @@ SYNOPSIS\n>  'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]\n>         <tagname> [<commit> | <object>]\n>  'git tag' -d <tagname>...\n> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]\n> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n>         [--points-at <object>] [--column[=<options>] | --no-column]\n>         [--create-reflog] [--sort=<key>] [--format=<format>]\n>         [--[no-]merged [<commit>]] [<pattern>...]\n> --\n\nJunio: I think this one's fallen through the cracks, could you please\npick this up? It's also something that should be in 2.13.1.\n"}]}