diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:39 (GMT) |
| commit | 8834ea375a404a6c79a6d8cd8cbc9954c6f2847d (patch) | |
| tree | b9a108984c7f802519edf68ff4ed6fd3ad97131a /builtin | |
| parent | fbef03d6ab6b9ee23ba1cf895f47314fe4308d2c (diff) | |
| parent | aac4fac1689f7d1414523d2ac96f1c737ee53b71 (diff) | |
| download | git-8834ea375a404a6c79a6d8cd8cbc9954c6f2847d.zip git-8834ea375a404a6c79a6d8cd8cbc9954c6f2847d.tar.gz git-8834ea375a404a6c79a6d8cd8cbc9954c6f2847d.tar.bz2 | |
Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint
"git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
rev, i.e. the object named by the the pathname with wildcard
characters in a tree object.
* nd/dwim-wildcards-as-pathspecs:
get_sha1: don't die() on bogus search strings
check_filename: tighten dwim-wildcard ambiguity
checkout: reorder check_filename conditional
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index e8110a9..d53ab75 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -981,7 +981,8 @@ 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) || !no_wildcard(arg))) recover_with_dwim = 0; /* * Accept "git checkout foo" and "git checkout foo --" |