Merge branch 'fg/maint-exclude-bq' into maint
* fg/maint-exclude-bq: Support "\" in non-wildcard exclusion entries
This commit is contained in:
commit
5f7b338310
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)
|
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,
|
void add_exclude(const char *string, const char *base,
|
||||||
|
@ -19,6 +19,9 @@ do
|
|||||||
>$dir/a.$i
|
>$dir/a.$i
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
>"#ignore1"
|
||||||
|
>"#ignore2"
|
||||||
|
>"#hidden"
|
||||||
|
|
||||||
cat >expect <<EOF
|
cat >expect <<EOF
|
||||||
a.2
|
a.2
|
||||||
@ -42,6 +45,9 @@ three/a.8
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo '.gitignore
|
echo '.gitignore
|
||||||
|
\#ignore1
|
||||||
|
\#ignore2*
|
||||||
|
\#hid*n
|
||||||
output
|
output
|
||||||
expect
|
expect
|
||||||
.gitignore
|
.gitignore
|
||||||
@ -79,9 +85,10 @@ test_expect_success \
|
|||||||
>output &&
|
>output &&
|
||||||
test_cmp expect output'
|
test_cmp expect output'
|
||||||
|
|
||||||
cat > excludes-file << EOF
|
cat > excludes-file <<\EOF
|
||||||
*.[1-8]
|
*.[1-8]
|
||||||
e*
|
e*
|
||||||
|
\#*
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
git config core.excludesFile excludes-file
|
git config core.excludesFile excludes-file
|
||||||
|
Loading…
Reference in New Issue
Block a user