X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft3000-ls-files-others.sh;h=adcbe03d561b2a7295a881d923b013bbefb9c7c7;hb=b642d9ef643371990c0a921836f2a074d48ce1b3;hp=1f461e3e812a7c71ea2d4fa6ff60d07b050392db;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh index 1f461e3e..adcbe03d 100755 --- a/t/t3000-ls-files-others.sh +++ b/t/t3000-ls-files-others.sh @@ -11,24 +11,46 @@ filesystem. path0 - a file path1 - a symlink path2/file2 - a file in a directory + path3-junk - a file to confuse things + path3/file3 - a file in a directory ' . ./test-lib.sh date >path0 ln -s xyzzy path1 -mkdir path2 +mkdir path2 path3 date >path2/file2 -test_expect_success \ - 'git-ls-files --others to show output.' \ - 'git-ls-files --others >output' -cat >expected <path2-junk +date >path3/file3 +date >path3-junk +git-update-index --add path3-junk path3/file3 + +cat >expected1 <expected2 + +test_expect_success \ + 'git-ls-files --others to show output.' \ + 'git-ls-files --others >output' test_expect_success \ 'git-ls-files --others should pick up symlinks.' \ - 'diff output expected' + 'diff output expected1' + +test_expect_success \ + 'git-ls-files --others --directory to show output.' \ + 'git-ls-files --others --directory >output' + + +test_expect_success \ + 'git-ls-files --others --directory should not get confused.' \ + 'diff output expected2' + test_done