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>
Jeff King committed
Feb 10, 2016 at 16:12 UTC
1cc777de6f4396f578e0f5e6b1a5ec23b96a52f0
1 file changed
+1
-1
builtin/checkout.c
+1
-1
@@ -965,7 +965,7 @@ static int parse_branchname_arg(int argc, const char **argv,
965
*/
966
int recover_with_dwim = dwim_new_local_branch_ok;
967
968
- if (check_filename(NULL, arg) && !has_dash_dash)
968
+ if (!has_dash_dash && check_filename(NULL, arg))
969
recover_with_dwim = 0;
970
/*
971
* Accept "git checkout foo" and "git checkout foo --"