mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/dwim-wildcards-as-pathspecs'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2016-02-24 13:25:52 -08:00
parent 7c0da37d7b aac4fac168
commit e6a6a768ca
5 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup.c
View File

@ -139,9 +139,7 @@ int check_filename(const char *prefix, const char *arg)
if (arg[2] == '\0') /* ":/" is root dir, always exists */
return 1;
name = arg + 2;
} else if (!no_wildcard(arg))
return 1;
else if (prefix)
} else if (prefix)
name = prefix_filename(prefix, strlen(prefix), arg);
else
name = arg;
@ -202,7 +200,7 @@ void verify_filename(const char *prefix,
{
if (*arg == '-')
die("bad flag '%s' used after filename", arg);
if (check_filename(prefix, arg))
if (check_filename(prefix, arg) || !no_wildcard(arg))
return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev);
}