t3101: modernise style

Also add a few " &&" cascade that were missing.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t3101-ls-tree-dirname.sh

@@ -21,33 +21,32 @@ entries.  Also test odd filename and missing entries handling.
 '
 . ./test-lib.sh
 
-test_expect_success \
+test_expect_success 'setup' '
-    'setup' \
+	echo 111 >1.txt &&
-    'echo 111 >1.txt &&
+	echo 222 >2.txt &&
-     echo 222 >2.txt &&
+	mkdir path0 path0/a path0/a/b path0/a/b/c &&
-     mkdir path0 path0/a path0/a/b path0/a/b/c &&
+	echo 111 >path0/a/b/c/1.txt &&
-     echo 111 >path0/a/b/c/1.txt &&
+	mkdir path1 path1/b path1/b/c &&
-     mkdir path1 path1/b path1/b/c &&
+	echo 111 >path1/b/c/1.txt &&
-     echo 111 >path1/b/c/1.txt &&
+	mkdir path2 &&
-     mkdir path2 &&
+	echo 111 >path2/1.txt &&
-     echo 111 >path2/1.txt &&
+	mkdir path3 &&
-     mkdir path3 &&
+	echo 111 >path3/1.txt &&
-     echo 111 >path3/1.txt &&
+	echo 222 >path3/2.txt &&
-     echo 222 >path3/2.txt &&
+	find *.txt path* \( -type f -o -type l \) -print |
-     find *.txt path* \( -type f -o -type l \) -print |
+	xargs git update-index --add &&
-     xargs git update-index --add &&
+	tree=`git write-tree` &&
-     tree=`git write-tree` &&
+	echo $tree
-     echo $tree'
+'
 
 test_output () {
-    sed -e "s/ $_x40	/ X	/" <current >check
+	sed -e "s/ $_x40	/ X	/" <current >check &&
-    test_cmp expected check
+	test_cmp expected check
 }
 
-test_expect_success \
+test_expect_success 'ls-tree plain' '
-    'ls-tree plain' \
+	git ls-tree $tree >current &&
-    'git ls-tree $tree >current &&
+	cat >expected <<\EOF &&
-     cat >expected <<\EOF &&
 100644 blob X	1.txt
 100644 blob X	2.txt
 040000 tree X	path0
@@ -55,13 +54,13 @@ test_expect_success \
 040000 tree X	path2
 040000 tree X	path3
 EOF
-     test_output'
+	test_output
+'
 
 # Recursive does not show tree nodes anymore...
-test_expect_success \
+test_expect_success 'ls-tree recursive' '
-    'ls-tree recursive' \
+	git ls-tree -r $tree >current &&
-    'git ls-tree -r $tree >current &&
+	cat >expected <<\EOF &&
-     cat >expected <<\EOF &&
 100644 blob X	1.txt
 100644 blob X	2.txt
 100644 blob X	path0/a/b/c/1.txt
@@ -70,68 +69,71 @@ test_expect_success \
 100644 blob X	path3/1.txt
 100644 blob X	path3/2.txt
 EOF
-     test_output'
+	test_output
+'
 
-test_expect_success \
+test_expect_success 'ls-tree filter 1.txt' '
-    'ls-tree filter 1.txt' \
+	git ls-tree $tree 1.txt >current &&
-    'git ls-tree $tree 1.txt >current &&
+	cat >expected <<\EOF &&
-     cat >expected <<\EOF &&
 100644 blob X	1.txt
 EOF
-     test_output'
+	test_output
+'
 
-test_expect_success \
+test_expect_success 'ls-tree filter path1/b/c/1.txt' '
-    'ls-tree filter path1/b/c/1.txt' \
+	git ls-tree $tree path1/b/c/1.txt >current &&
-    'git ls-tree $tree path1/b/c/1.txt >current &&
+	cat >expected <<\EOF &&
-     cat >expected <<\EOF &&
 100644 blob X	path1/b/c/1.txt
 EOF
-     test_output'
+	test_output
+'
 
-test_expect_success \
+test_expect_success 'ls-tree filter all 1.txt files' '
-    'ls-tree filter all 1.txt files' \
+	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
-    'git ls-tree $tree 1.txt path0/a/b/c/1.txt path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
+		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
-     cat >expected <<\EOF &&
+	cat >expected <<\EOF &&
 100644 blob X	1.txt
 100644 blob X	path0/a/b/c/1.txt
 100644 blob X	path1/b/c/1.txt
 100644 blob X	path2/1.txt
 100644 blob X	path3/1.txt
 EOF
-     test_output'
+	test_output
+'
 
 # I am not so sure about this one after ls-tree doing pathspec match.
 # Having both path0/a and path0/a/b/c makes path0/a redundant, and
 # it behaves as if path0/a/b/c, path1/b/c, path2 and path3 are specified.
-test_expect_success \
+test_expect_success 'ls-tree filter directories' '
-    'ls-tree filter directories' \
+	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
-    'git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
+	cat >expected <<\EOF &&
-     cat >expected <<\EOF &&
 040000 tree X	path0/a/b/c
 040000 tree X	path1/b/c
 040000 tree X	path2
 040000 tree X	path3
 EOF
-     test_output'
+	test_output
+'
 
 # Again, duplicates are filtered away so this is equivalent to
 # having 1.txt and path3
-test_expect_success \
+test_expect_success 'ls-tree filter odd names' '
-    'ls-tree filter odd names' \
+	git ls-tree $tree 1.txt ./1.txt .//1.txt \
-    'git ls-tree $tree 1.txt ./1.txt .//1.txt path3/1.txt path3/./1.txt path3 path3// >current &&
+		path3/1.txt path3/./1.txt path3 path3// >current &&
-     cat >expected <<\EOF &&
+	cat >expected <<\EOF &&
 100644 blob X	1.txt
 100644 blob X	path3/1.txt
 100644 blob X	path3/2.txt
 EOF
-     test_output'
+	test_output
+'
 
-test_expect_success \
+test_expect_success 'ls-tree filter missing files and extra slashes' '
-    'ls-tree filter missing files and extra slashes' \
+	git ls-tree $tree 1.txt/ abc.txt \
-    'git ls-tree $tree 1.txt/ abc.txt path3//23.txt path3/2.txt/// >current &&
+		path3//23.txt path3/2.txt/// >current &&
-     cat >expected <<\EOF &&
+	>expected &&
-EOF
+	test_output
-     test_output'
+'
 
 test_expect_success 'ls-tree filter is leading path match' '
 	git ls-tree $tree pa path3/a >current &&
@@ -198,7 +200,7 @@ EOF
 '
 
 test_expect_success 'ls-tree --name-only' '
-	git ls-tree --name-only $tree >current
+	git ls-tree --name-only $tree >current &&
 	cat >expected <<\EOF &&
 1.txt
 2.txt
@@ -211,7 +213,7 @@ EOF
 '
 
 test_expect_success 'ls-tree --name-only -r' '
-	git ls-tree --name-only -r $tree >current
+	git ls-tree --name-only -r $tree >current &&
 	cat >expected <<\EOF &&
 1.txt
 2.txt