From: Jeff King <peff@peff.net>
Date: Fri, 26 May 2017 19:10:53 +0000 (-0400)
Subject: verify_filename(): flip order of checks
X-Git-Tag: v2.14.0-rc0~89^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cb47ab6958192a4b4b3b0616b2ab37f6680547f?ds=sidebyside

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>
---

diff --git a/setup.c b/setup.c
index 89fcc12ab7..1de87ed842 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);
 }