summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-05 23:41:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-05 23:41:39 (GMT)
commit1456d964fa733dd35122a578d85b72e408108141 (patch)
tree00cdfea7e623a817cc5862b1ddca4e478fd3fcbb
parent2e2e91d6b27f522707322835a1f8c4a5e18a2419 (diff)
parentdd482eeac2524627beee323438dd1fdf34b4f97e (diff)
downloadgit-1456d964fa733dd35122a578d85b72e408108141.zip
git-1456d964fa733dd35122a578d85b72e408108141.tar.gz
git-1456d964fa733dd35122a578d85b72e408108141.tar.bz2
Merge branch 'fg/exclude-bq'
* fg/exclude-bq: Support "\" in non-wildcard exclusion entries
-rw-r--r--dir.c2
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh9
2 files changed, 9 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index cfd1ea5..2245749 100644
--- a/dir.c
+++ b/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,
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 85aef12..c65bca8 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -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