[PATCH 6/6] verify_filename(): flip order of checks
- From
Jeff King <peff@peff.net>
- Date
- May 26, 2017, 19:10 UTC
- Message-ID
- <20170526191053.v2mmx7oour6u5chp@sigill.intra.peff.net>
- 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