diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:48:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:48:07 -0700 |
| commit | fa711bc1983efca058ef6af19ffa808690b21d8c (patch) | |
| tree | 2a2b98e69578c4d0adefbea7336a70083fb70397 | |
| parent | de55390d36f30d5ef4be84eb9adba74f6903aa8e (diff) | |
| parent | dd482eeac2524627beee323438dd1fdf34b4f97e (diff) | |
| download | git-fa711bc1983efca058ef6af19ffa808690b21d8c.tar.gz | |
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
| -rw-r--r-- | dir.c | 2 | ||||
| -rwxr-xr-x | t/t3001-ls-files-others-exclude.sh | 9 |
2 files changed, 9 insertions, 2 deletions
@@ -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, diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index 8666946b02..6a17113745 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 |