From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 6/6] verify_filename(): flip order of checks
Date: Fri, 26 May 2017 15:10:53 -0400 [thread overview]
Message-ID: <20170526191053.v2mmx7oour6u5chp@sigill.intra.peff.net> (raw)
In-Reply-To: <20170526190607.jr44oygs6mzm3q6e@sigill.intra.peff.net>
The looks_like_pathspec() check is much cheaper than
check_filename(), which actually stats the file. Since
either is sufficient for our return value, we should do the
cheaper one first, potentially short-circuiting the other.
Signed-off-by: Jeff King <peff@peff.net>
---
Probably doesn't matter, but it bugged me and it was subtle enough that
I pulled it out into its own commit.
setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index 89fcc12ab..1de87ed84 100644
--- a/setup.c
+++ b/setup.c
@@ -229,7 +229,7 @@ void verify_filename(const char *prefix,
{
if (*arg == '-')
die("bad flag '%s' used after filename", arg);
- if (check_filename(prefix, arg) || looks_like_pathspec(arg))
+ if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev);
}
--
2.13.0.496.ge44ba89db
next prev parent reply other threads:[~2017-05-26 19:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 15:27 [RFC/PATCH] recognize pathspec magic without "--" disambiguation Jeff King
2017-05-26 2:13 ` Junio C Hamano
2017-05-26 13:24 ` Jeff King
2017-05-26 19:06 ` [PATCH 0/6] make "^:foo" work without disambiguating "--" Jeff King
2017-05-26 19:06 ` [PATCH 1/6] t4208: add check for ":/" without matching file Jeff King
2017-05-26 19:07 ` [PATCH 2/6] check_filename(): refactor ":/" handling Jeff King
2017-05-26 19:07 ` [PATCH 3/6] check_filename(): use skip_prefix Jeff King
2017-05-26 19:08 ` [PATCH 4/6] check_filename(): handle ":^" path magic Jeff King
2017-05-26 19:10 ` [PATCH 5/6] verify_filename(): treat ":(magic)" as a pathspec Jeff King
2017-05-26 19:10 ` Jeff King [this message]
2017-05-27 9:54 ` [RFC/PATCH] recognize pathspec magic without "--" disambiguation Ævar Arnfjörð Bjarmason
2017-05-27 20:39 ` Jeff King
2017-05-28 0:04 ` Junio C Hamano
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=20170526191053.v2mmx7oour6u5chp@sigill.intra.peff.net \
--to=peff@peff.net \
--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.
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).