From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v1] perf/aggregate: tighten option parsing
Date: Fri, 20 Apr 2018 14:10:41 +0200 [thread overview]
Message-ID: <20180420121041.32558-1-chriscool@tuxfamily.org> (raw)
When passing an option '--foo' that it does not recognize, the
aggregate.perl script should die with an helpful error message
like:
unknown option '--foo' at ./aggregate.perl line 80.
rather than:
fatal: Needed a single revision
rev-parse --verify --foo: command returned error: 128
While at it let's also prevent something like
'foo--sort-by=regression' to be handled as if
'--sort-by=regression' had been used.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/perf/aggregate.perl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 48637ef64b..2cc9eb0ac5 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -46,7 +46,7 @@ while (scalar @ARGV) {
shift @ARGV;
next;
}
- if ($arg =~ /--sort-by(?:=(.*))?/) {
+ if ($arg =~ /^--sort-by(?:=(.*))?$/) {
shift @ARGV;
if (defined $1) {
$sortby = $1;
@@ -76,6 +76,9 @@ while (scalar @ARGV) {
}
next;
}
+ if ($arg =~ /^--.+$/) {
+ die "unknown option '$arg'";
+ }
last if -f $arg or $arg eq "--";
if (! -d $arg) {
my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
--
2.17.0.257.g28b659db43
next reply other threads:[~2018-04-20 12:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 12:10 Christian Couder [this message]
2018-04-20 17:46 ` [PATCH v1] perf/aggregate: tighten option parsing Eric Sunshine
2018-04-20 18:27 ` Ævar Arnfjörð Bjarmason
2018-04-21 3:50 ` Junio C Hamano
2018-04-25 12:55 ` Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180420121041.32558-1-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).