mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: reorder check_filename conditional

Browse Source 
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>
This commit is contained in:
Jeff King
2016-02-10 16:12:34 -05:00
committed by Junio C Hamano
parent b3325dfc64
commit 1cc777de6f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@ -965,7 +965,7 @@ static int parse_branchname_arg(int argc, const char **argv,
*/ */
int recover_with_dwim = dwim_new_local_branch_ok; 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; recover_with_dwim = 0;
/* /*
* Accept "git checkout foo" and "git checkout foo --" * Accept "git checkout foo" and "git checkout foo --"