From: Ævar Arnfjörð Bjarmason <avarab@gmail.com> To: Jeff King <peff@peff.net> Cc: Git Mailing List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>, Lars Hjemli <hjemli@gmail.com>, Christian Couder <christian.couder@gmail.com>, Carlos Rica <jasampler@gmail.com>, Samuel Tardieu <sam@rfc1149.net>, Tom Grennan <tmgrennan@gmail.com> Subject: Re: [PATCH 4/8] tag: Implicitly supply --list given another list-like option Date: Mon, 20 Mar 2017 10:16:49 +0100 Message-ID: <CACBZZX41W40PzSdxsPU+=NP==LuYdAUcD2n4Q381opn63DfcqA@mail.gmail.com> (raw) In-Reply-To: <20170320035549.smzgu2jkaxrhuxl4@sigill.intra.peff.net> On Mon, Mar 20, 2017 at 4:55 AM, Jeff King <peff@peff.net> wrote: > On Sat, Mar 18, 2017 at 10:32:52AM +0000, Ævar Arnfjörð Bjarmason wrote: > >> With this change errors messages such as "--contains option is only >> allowed with -l" don't make sense anymore, since options like >> --contain turn on -l. Instead we error out when list-like options such >> as --contain are used in conjunction with conflicting options such as >> -d or -v. > > Yeah, I think this is the right approach. > >> This change does not consider "-n" a list-like option, even though >> that might be logical. Permitting it would allow: >> >> git tag -n 100 >> >> As a synonym for: >> >> git tag -n --list 100 >> >> Which, while not technically ambiguous as the option must already be >> provided as -n<num> rather than -n <num>, would be confusing. > > I'm not sure the existing behavior isn't confusing anyway (most optional > arguments are). But I don't mind being conservative and leaving out "-n" > for now; we can always convert it later if somebody feels strongly about > it. > >> diff --git a/builtin/tag.c b/builtin/tag.c >> index 0bba3fd070..3483636e59 100644 >> --- a/builtin/tag.c >> +++ b/builtin/tag.c >> @@ -454,8 +454,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix) >> } >> create_tag_object = (opt.sign || annotate || msg.given || msgfile); >> >> - if (argc == 0 && !cmdmode && !create_tag_object) >> - cmdmode = 'l'; >> + if (!cmdmode && !create_tag_object) { >> + if (argc == 0) >> + cmdmode = 'l'; >> + else if (filter.with_commit || filter.points_at.nr || filter.merge_commit) >> + cmdmode = 'l'; >> + } > > Makes sense. > >> @@ -483,15 +487,16 @@ int cmd_tag(int argc, const char **argv, const char *prefix) >> if (column_active(colopts)) >> stop_column_filter(); >> return ret; >> + } else { >> + if (filter.lines != -1) >> + die(_("-n option is only allowed in list mode.")); >> + if (filter.with_commit) >> + die(_("--contains option is only allowed in list mode.")); >> + if (filter.points_at.nr) >> + die(_("--points-at option is only allowed in list mode.")); >> + if (filter.merge_commit) >> + die(_("--merged and --no-merged options are only allowed in list mode.")); >> } >> - if (filter.lines != -1) >> - die(_("-n option is only allowed with -l.")); >> - if (filter.with_commit) >> - die(_("--contains option is only allowed with -l.")); >> - if (filter.points_at.nr) >> - die(_("--points-at option is only allowed with -l.")); >> - if (filter.merge_commit) >> - die(_("--merged and --no-merged option are only allowed with -l")); > > I'm not sure why these go into the "else" clause here. The other side of > the conditional (i.e., when we are in list mode) always returns. I don't > _mind_ it, it's just surprising in this patch. Changed it. It was a wart left over from an earlier version of this that didn't make it on-list where the else mattered. > While we are re-wording the messages, we may want to drop the periods at > the end of the first three (or keep it on the fourth one, but I our > usual style is to omit it). Done. >> --- a/t/t7004-tag.sh >> +++ b/t/t7004-tag.sh > > The tests looked reasonable to me. > > -Peff
next prev parent reply index Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-18 10:32 [PATCH 0/8] Various changes to the "tag" command Ævar Arnfjörð Bjarmason 2017-03-18 10:32 ` [PATCH 1/8] tag: Remove a TODO item from the test suite Ævar Arnfjörð Bjarmason 2017-03-18 18:14 ` Junio C Hamano 2017-03-18 18:42 ` [PATCH 0/2] doc/SubmittingPatches: A couple of minor improvements Ævar Arnfjörð Bjarmason 2017-03-18 18:42 ` [PATCH 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..." Ævar Arnfjörð Bjarmason 2017-03-18 19:04 ` Junio C Hamano 2017-03-18 19:16 ` Ævar Arnfjörð Bjarmason 2017-03-18 20:07 ` Junio C Hamano 2017-03-18 18:42 ` [PATCH 2/2] doc/SubmittingPatches: show how to get a CLI commit summary Ævar Arnfjörð Bjarmason 2017-03-18 19:07 ` Junio C Hamano 2017-03-19 0:48 ` [PATCH 1/8] tag: Remove a TODO item from the test suite Jakub Narębski 2017-03-19 6:43 ` Ævar Arnfjörð Bjarmason 2017-03-18 10:32 ` [PATCH 2/8] tag: Refactor the options handling code to be less bizarro Ævar Arnfjörð Bjarmason 2017-03-18 18:35 ` Junio C Hamano 2017-03-18 19:13 ` Ævar Arnfjörð Bjarmason 2017-03-18 19:27 ` Junio C Hamano 2017-03-18 20:00 ` Ævar Arnfjörð Bjarmason 2017-03-18 10:32 ` [PATCH 3/8] tag: Change misleading --list <pattern> documentation Ævar Arnfjörð Bjarmason 2017-03-18 18:43 ` Junio C Hamano 2017-03-18 19:49 ` Ævar Arnfjörð Bjarmason 2017-03-20 3:44 ` Jeff King 2017-03-20 15:55 ` Junio C Hamano 2017-03-20 17:07 ` Junio C Hamano 2017-03-20 16:09 ` Ævar Arnfjörð Bjarmason 2017-03-20 16:11 ` Jeff King 2017-03-18 10:32 ` [PATCH 4/8] tag: Implicitly supply --list given another list-like option Ævar Arnfjörð Bjarmason 2017-03-20 3:55 ` Jeff King 2017-03-20 9:16 ` Ævar Arnfjörð Bjarmason [this message] 2017-03-18 10:32 ` [PATCH 5/8] tag: Implicitly supply --list given the -n option Ævar Arnfjörð Bjarmason 2017-03-20 4:02 ` Jeff King 2017-03-18 10:32 ` [PATCH 6/8] ref-filter: Add --no-contains option to tag/branch/for-each-ref Ævar Arnfjörð Bjarmason 2017-03-20 4:25 ` Jeff King 2017-03-20 9:32 ` Ævar Arnfjörð Bjarmason 2017-03-20 19:52 ` Jeff King 2017-03-20 20:04 ` Ævar Arnfjörð Bjarmason 2017-03-18 10:32 ` [PATCH 8/8] tag: Change --point-at to default to HEAD Ævar Arnfjörð Bjarmason 2017-03-18 18:54 ` Junio C Hamano 2017-03-18 19:52 ` Ævar Arnfjörð Bjarmason 2017-03-20 4:26 ` [PATCH 0/8] Various changes to the "tag" command Jeff King 2017-03-20 15:57 ` Junio C Hamano 2017-03-21 15:51 [PATCH v2 2/2] doc/SubmittingPatches: show how to get a CLI commit summary SZEDER Gábor 2017-03-21 17:58 ` Junio C Hamano 2017-03-21 18:47 ` Ævar Arnfjörð Bjarmason 2017-03-21 20:01 ` SZEDER Gábor 2017-03-21 20:13 ` Junio C Hamano
Reply instructions: You may reply publically 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='CACBZZX41W40PzSdxsPU+=NP==LuYdAUcD2n4Q381opn63DfcqA@mail.gmail.com' \ --to=avarab@gmail.com \ --cc=christian.couder@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=hjemli@gmail.com \ --cc=jasampler@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
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox