Merge branch 'jn/tests'

* jn/tests:
  t3000 (ls-files -o): modernize style

t/t3000-ls-files-others.sh

@@ -17,57 +17,52 @@ filesystem.
 '
 . ./test-lib.sh
 
-date >path0
+test_expect_success 'setup ' '
-if test_have_prereq SYMLINKS
+	date >path0 &&
-then
+	if test_have_prereq SYMLINKS
+	then
 		ln -s xyzzy path1
-else
+	else
-	date > path1
+		date >path1
-fi
+	fi &&
-mkdir path2 path3 path4
+	mkdir path2 path3 path4 &&
-date >path2/file2
+	date >path2/file2 &&
-date >path2-junk
+	date >path2-junk &&
-date >path3/file3
+	date >path3/file3 &&
-date >path3-junk
+	date >path3-junk &&
-git update-index --add path3-junk path3/file3
+	git update-index --add path3-junk path3/file3
-
+'
-cat >expected1 <<EOF
-expected1
-expected2
-expected3
-output
-path0
-path1
-path2-junk
-path2/file2
-EOF
-sed -e 's|path2/file2|path2/|' <expected1 >expected2
-cat <expected2 >expected3
-echo path4/ >>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.' \
-    'test_cmp expected1 output'
 
-test_expect_success \
+test_expect_success 'setup: expected output' '
-    'git ls-files --others --directory to show output.' \
+	cat >expected1 <<-\EOF &&
-    'git ls-files --others --directory >output'
+	expected1
+	expected2
+	expected3
+	output
+	path0
+	path1
+	path2-junk
+	path2/file2
+	EOF
 
+	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
+	cp expected2 expected3 &&
+	echo path4/ >>expected2
+'
 
-test_expect_success \
+test_expect_success 'ls-files --others' '
-    'git ls-files --others --directory should not get confused.' \
+	git ls-files --others >output &&
-    'test_cmp expected2 output'
+	test_cmp expected1 output
+'
 
-test_expect_success \
+test_expect_success 'ls-files --others --directory' '
-    'git ls-files --others --directory --no-empty-directory to show output.' \
+	git ls-files --others --directory >output &&
-    'git ls-files --others --directory --no-empty-directory >output'
+	test_cmp expected2 output
+'
 
-test_expect_success \
+test_expect_success '--no-empty-directory hides empty directory' '
-    '--no-empty-directory hides empty directory' \
+	git ls-files --others --directory --no-empty-directory >output &&
-    'test_cmp expected3 output'
+	test_cmp expected3 output
+'
 
 test_done