From 78c2cff61f87d43c1f4ef5a03547f093c4c6e0c9 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sat, 7 Jan 2006 14:17:58 -0800
Subject: [PATCH] ls-files --others --directory: test
Add a test to run with --directory option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
t/t3000-ls-files-others.sh | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 1f461e3e812..adcbe03d561 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 <<EOF
+date >path2-junk
+date >path3/file3
+date >path3-junk
+git-update-index --add path3-junk path3/file3
+
+cat >expected1 <<EOF
+expected1
+expected2
output
path0
path1
+path2-junk
path2/file2
EOF
+sed -e 's|path2/file2|path2/|' <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