aboutsummaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-05-26 15:10:53 -0400
committerJunio C Hamano <gitster@pobox.com>2017-05-29 11:36:56 +0900
commit2cb47ab6958192a4b4b3b0616b2ab37f6680547f (patch)
tree498205c45cf22cadc8a99287cf497336f2273df4 /setup.c
parentc99eddd83519811d6604b4ce4a8d2001787a30d4 (diff)
downloadgit-2cb47ab6958192a4b4b3b0616b2ab37f6680547f.tar.gz
git-2cb47ab6958192a4b4b3b0616b2ab37f6680547f.tar.xz
verify_filename(): flip order of checks
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
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);
}