diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:32 -0800 |
| commit | 958742ba43a0e3847cc7095869f0d96febe47132 (patch) | |
| tree | a1617297d94ecff73a737dcb333b6996be7cb8da /t | |
| parent | 3e606ea7ca432c084677ecd52d64650cceef2e77 (diff) | |
| parent | 500348aa6859e436a890f5f5a7e0eeea8ef6c1de (diff) | |
| download | git-958742ba43a0e3847cc7095869f0d96febe47132.tar.gz | |
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
* jk/maint-1.6.3-ls-files-i:
ls-files: unbreak "ls-files -i"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3003-ls-files-exclude.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3003-ls-files-exclude.sh b/t/t3003-ls-files-exclude.sh index fc1e379321..d5ec333131 100755 --- a/t/t3003-ls-files-exclude.sh +++ b/t/t3003-ls-files-exclude.sh @@ -29,4 +29,12 @@ test_expect_success 'add file to gitignore' ' ' check_all_output +test_expect_success 'ls-files -i lists only tracked-but-ignored files' ' + echo content >other-file && + git add other-file && + echo file >expect && + git ls-files -i --exclude-standard >output && + test_cmp expect output +' + test_done |