diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:53:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:53:53 -0700 |
| commit | 5f7b3383106d4dc8b9556d52e8fabd8d468c994a (patch) | |
| tree | 3ea6d684cf2d992d05ee1a5130baa4845332d39c | |
| parent | bbc6a14b723ae831f35fc1b923fe497e7329443e (diff) | |
| parent | dd482eeac2524627beee323438dd1fdf34b4f97e (diff) | |
| download | git-5f7b3383106d4dc8b9556d52e8fabd8d468c994a.tar.gz git-5f7b3383106d4dc8b9556d52e8fabd8d468c994a.tar.xz | |
Merge branch 'fg/maint-exclude-bq' into maint
* fg/maint-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
@@ -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 85aef12a1..c65bca838 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 |