diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:43:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:43:54 (GMT) |
| commit | 3af59e6f31c5304d476884b69b6b88dfd492812b (patch) | |
| tree | 775af30257e16c054b29855271f2a2d416cc4884 /t/t3001-ls-files-others-exclude.sh | |
| parent | 34349bea60ec9cb3e320175cad9eb01b3054e5c6 (diff) | |
| parent | 48ffef966c762578eb818c0c54a7e11dd054f5db (diff) | |
| download | git-3af59e6f31c5304d476884b69b6b88dfd492812b.zip git-3af59e6f31c5304d476884b69b6b88dfd492812b.tar.gz git-3af59e6f31c5304d476884b69b6b88dfd492812b.tar.bz2 | |
Merge branch 'jc/ls-files-ignored-pathspec'
* jc/ls-files-ignored-pathspec:
ls-files: fix overeager pathspec optimization
read_directory(): further split treat_path()
read_directory_recursive(): refactor handling of a single path into a separate function
t3001: test ls-files -o ignored/dir
Diffstat (limited to 't/t3001-ls-files-others-exclude.sh')
| -rwxr-xr-x | t/t3001-ls-files-others-exclude.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index 132c476..6d2f2b6 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -175,4 +175,43 @@ test_expect_success 'negated exclude matches can override previous ones' ' grep "^a.1" output ' +test_expect_success 'subdirectory ignore (setup)' ' + mkdir -p top/l1/l2 && + ( + cd top && + git init && + echo /.gitignore >.gitignore && + echo l1 >>.gitignore && + echo l2 >l1/.gitignore && + >l1/l2/l1 + ) +' + +test_expect_success 'subdirectory ignore (toplevel)' ' + ( + cd top && + git ls-files -o --exclude-standard + ) >actual && + >expect && + test_cmp expect actual +' + +test_expect_success 'subdirectory ignore (l1/l2)' ' + ( + cd top/l1/l2 && + git ls-files -o --exclude-standard + ) >actual && + >expect && + test_cmp expect actual +' + +test_expect_success 'subdirectory ignore (l1)' ' + ( + cd top/l1 && + git ls-files -o --exclude-standard + ) >actual && + >expect && + test_cmp expect actual +' + test_done |