Browse Source

Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0

* fg/maint-1.6.0-exclude-bq:
  Support "\" in non-wildcard exclusion entries
maint
Junio C Hamano 16 years ago
parent
commit
fa711bc198
  1. 2
      dir.c
  2. 9
      t/t3001-ls-files-others-exclude.sh

2
dir.c

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

@ -19,6 +19,9 @@ do @@ -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 @@ -42,6 +45,9 @@ three/a.8
EOF

echo '.gitignore
\#ignore1
\#ignore2*
\#hid*n
output
expect
.gitignore
@ -79,9 +85,10 @@ test_expect_success \ @@ -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…
Cancel
Save