From: Jeff King <peff@peff.net>
Date: Wed, 10 Feb 2016 21:12:34 +0000 (-0500)
Subject: checkout: reorder check_filename conditional
X-Git-Tag: v2.8.0-rc0~36^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cc777de6f4396f578e0f5e6b1a5ec23b96a52f0;p=thirdparty%2Fgit.git

checkout: reorder check_filename conditional

If we have a "--" flag, we should not be doing DWIM magic
based on whether arguments can be filenames. Reorder the
conditional to avoid the check_filename() call entirely in
this case. The outcome is the same, but the short-circuit
makes the dependency more clear.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3e141fc149..d34f58eba6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -965,7 +965,7 @@ static int parse_branchname_arg(int argc, const char **argv,
 		 */
 		int recover_with_dwim = dwim_new_local_branch_ok;
 
-		if (check_filename(NULL, arg) && !has_dash_dash)
+		if (!has_dash_dash && check_filename(NULL, arg))
 			recover_with_dwim = 0;
 		/*
 		 * Accept "git checkout foo" and "git checkout foo --"