mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'fg/exclude-bq'
* fg/exclude-bq: Support "\" in non-wildcard exclusion entries
This commit is contained in:
commit
1456d964fa
2
dir.c
2
dir.c
|
@ -137,7 +137,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen,
|
|||
|
||||
static int no_wildcard(const char *string)
|
||||
{
|
||||
return string[strcspn(string, "*?[{")] == '\0';
|
||||
return string[strcspn(string, "*?[{\\")] == '\0';
|
||||
}
|
||||
|
||||
void add_exclude(const char *string, const char *base,
|
||||
|
|
|
@ -19,6 +19,9 @@ do
|
|||
>$dir/a.$i
|
||||
done
|
||||
done
|
||||
>"#ignore1"
|
||||
>"#ignore2"
|
||||
>"#hidden"
|
||||
|
||||
cat >expect <<EOF
|
||||
a.2
|
||||
|
@ -42,6 +45,9 @@ three/a.8
|
|||
EOF
|
||||
|
||||
echo '.gitignore
|
||||
\#ignore1
|
||||
\#ignore2*
|
||||
\#hid*n
|
||||
output
|
||||
expect
|
||||
.gitignore
|
||||
|
@ -79,9 +85,10 @@ test_expect_success \
|
|||
>output &&
|
||||
test_cmp expect output'
|
||||
|
||||
cat > excludes-file << EOF
|
||||
cat > excludes-file <<\EOF
|
||||
*.[1-8]
|
||||
e*
|
||||
\#*
|
||||
EOF
|
||||
|
||||
git config core.excludesFile excludes-file
|
||||
|
|
Loading…
Reference in a new issue