diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-24 13:25:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-24 13:25:52 -0800 |
| commit | e6a6a768ca472afed90adbbd786e5c04fff6be7b (patch) | |
| tree | 24e3f08992b8d7135cf703a013c591f41018757b /builtin | |
| parent | 7c0da37d7b0e09c199788191b322bf45fd003e3c (diff) | |
| parent | aac4fac1689f7d1414523d2ac96f1c737ee53b71 (diff) | |
| download | git-e6a6a768ca472afed90adbbd786e5c04fff6be7b.tar.gz git-e6a6a768ca472afed90adbbd786e5c04fff6be7b.tar.xz | |
Merge branch 'nd/dwim-wildcards-as-pathspecs'
"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 5af84a311..cfa66e25e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -982,7 +982,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 --" |