From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
Kirill Likhodedov <kirill.likhodedov@jetbrains.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git <git@vger.kernel.org>
Subject: [PATCH 1/3] checkout: reorder check_filename conditional
Date: Wed, 10 Feb 2016 16:12:34 -0500 [thread overview]
Message-ID: <20160210211234.GA5799@sigill.intra.peff.net> (raw)
In-Reply-To: <20160210211206.GA5755@sigill.intra.peff.net>
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>
---
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 --"
--
2.7.1.545.gfd1d4e5
next prev parent reply other threads:[~2016-02-10 21:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-06 13:16 git show doesn't work on file names with square brackets Kirill Likhodedov
2016-02-06 14:21 ` Johannes Schindelin
2016-02-06 14:29 ` Kirill Likhodedov
2016-02-06 16:10 ` Johannes Schindelin
2016-02-06 23:48 ` Duy Nguyen
2016-02-07 15:11 ` Kirill Likhodedov
2016-02-08 5:06 ` Duy Nguyen
2016-02-08 14:15 ` Jeff King
2016-02-08 14:24 ` Jeff King
2016-02-08 15:07 ` Jeff King
2016-02-08 19:35 ` Junio C Hamano
2016-02-08 19:52 ` Jeff King
2016-02-08 20:20 ` Jeff King
2016-02-08 20:56 ` Jeff King
2016-02-08 22:36 ` Junio C Hamano
2016-02-10 15:45 ` Jeff King
2016-02-09 20:37 ` Junio C Hamano
2016-02-10 16:15 ` Jeff King
2016-02-10 17:35 ` Junio C Hamano
2016-02-10 21:12 ` Jeff King
2016-02-10 21:12 ` Jeff King [this message]
2016-02-10 21:31 ` [PATCH 1/3] checkout: reorder check_filename conditional Junio C Hamano
2016-02-10 21:14 ` [PATCH 2/3] check_filename: tighten dwim-wildcard ambiguity Jeff King
2016-02-10 21:19 ` [PATCH 3/3] get_sha1: don't die() on bogus search strings Jeff King
2016-02-10 21:52 ` Junio C Hamano
2016-02-07 15:09 ` git show doesn't work on file names with square brackets Kirill Likhodedov
2016-02-07 17:10 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160210211234.GA5799@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kirill.likhodedov@jetbrains.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).