Jeff King <peff@xxxxxxxx> writes: > 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. It also allows check_filename() to die(), and lets the user to prevent it with "--"---"Don't check when we do not have to" is the right thing to do. Thanks. > Signed-off-by: Jeff King <peff@xxxxxxxx> > --- > builtin/checkout.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 5af84a3..f6a2809 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -982,7 +982,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 --" -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html