development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Support "\" in non-wildcard exclusion entries

Browse source 
"\" was treated differently in exclude rules depending on whether a
wildcard match was done. For wildcard rules, "\" was de-escaped in
fnmatch, but this was not done for other rules since they used strcmp
instead.  A file named "#foo" would not be excluded by "\#foo", but would
be excluded by "\#foo*".

We now treat all rules with "\" as wildcard rules.

Another solution could be to de-escape all non-wildcard rules as we
read them, but we would have to do the de-escaping exactly as fnmatch
does it to avoid inconsistencies.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Finn Arne Gangstad 2009-02-10 15:20:17 +01:00 committed by Junio C Hamano
parent ab2fdb3b62
commit dd482eeac2
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dir.c
View file

@ -139,7 +139,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen, int pre
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,

9
t/t3001-ls-files-others-exclude.sh
View file

@ -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