diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:36:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:36:57 -0700 |
| commit | bf0fe35c938ac9f03d1369600b0c76e428a57507 (patch) | |
| tree | 528be1c6679b5f869d199e38be1777eac352eeb1 /t/t3001-ls-files-others-exclude.sh | |
| parent | Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1 (diff) | |
| parent | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 (diff) | |
| download | tgif-bf0fe35c938ac9f03d1369600b0c76e428a57507.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
bisect: fix another instance of eval'ed string
bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
Support "\" in non-wildcard exclusion entries
Conflicts:
git-bisect.sh
Diffstat (limited to 't/t3001-ls-files-others-exclude.sh')
| -rwxr-xr-x | t/t3001-ls-files-others-exclude.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index 85aef12a11..c65bca8388 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 |