From: Eric Sunshine <sunshine@sunshineco.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: Git List <git@vger.kernel.org>, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH] describe: bail of --contains --all is used with --exclude or --match
Date: Tue, 26 Feb 2019 18:34:23 -0500 [thread overview]
Message-ID: <CAPig+cR8n05zvzxFnbyGm08hEHTTTozzGY1DTE1SvDxsuPPTfw@mail.gmail.com> (raw)
In-Reply-To: <20190226215348.5119-1-jacob.e.keller@intel.com>
On Tue, Feb 26, 2019 at 4:54 PM Jacob Keller <jacob.e.keller@intel.com> wrote:
> describe: bail of --contains --all is used with --exclude or --match
s/of/if/
> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
> ---
> diff --git a/builtin/describe.c b/builtin/describe.c
> @@ -589,6 +589,9 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
> for_each_string_list_item(item, &exclude_patterns)
> argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string);
> + } else {
> + if (patterns.nr || exclude_patterns.nr)
> + die(_("--contains with --all does not support --match or --exclude"));
> }
Could be folded into an 'else if':
} else if (patterns.nr || exclude_patterns.nr) {
die(...);
}
but not worth a re-roll.
prev parent reply other threads:[~2019-02-26 23:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 21:53 [PATCH] describe: bail of --contains --all is used with --exclude or --match Jacob Keller
2019-02-26 23:34 ` Eric Sunshine [this message]
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=CAPig+cR8n05zvzxFnbyGm08hEHTTTozzGY1DTE1SvDxsuPPTfw@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@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).