Clean up the whole tree

1 file changed, 5 insertions, 10 deletions

diff --git a/tests/t0109-patch.sh b/tests/t0109-patch.shindex 0982102..f4168f4 100755--- a/tests/t0109-patch.sh+++ b/tests/t0109-patch.sh@@ -14,8 +14,7 @@ check_cgit_signature() { }  # The version the built binary signs its patches with.-CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" \-	"$TEST_OUTPUT_DIRECTORY/../build/VERSION")+CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" "$TEST_OUTPUT_DIRECTORY/../build/VERSION")  test_expect_success 'generate foo/patch' ' 	cgit_query "url=foo/patch" >tmp@@ -45,8 +44,7 @@ test_expect_success 'compare with output of git-format-patch(1)' ' '  test_expect_success 'find initial commit' '-	root=$(git --git-dir="$PWD/repos/foo/.git" \-		rev-list --max-parents=0 HEAD)+	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD) '  test_expect_success 'generate patch for initial commit' '@@ -69,8 +67,7 @@ test_expect_success 'find `cgit` signature on the range' '  test_expect_success 'compare the range with git-format-patch(1)' ' 	git --git-dir="$PWD/repos/foo/.git" format-patch --subject-prefix="" \-		-N --signature="cgit $CGIT_VERSION" --stdout \-		HEAD~3..HEAD >tmp2 &&+		-N --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 && 	strip_headers <tmp >tmp_ && 	test_cmp tmp_ tmp2 '@@ -83,10 +80,8 @@ test_expect_success 'max-patch-count bounds a patch range' ' 		echo "repo.path=$PWD/repos/foo/.git" 	} >patchcountrc && 	id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&-	root=$(git --git-dir="$PWD/repos/foo/.git" \-		rev-list --max-parents=0 HEAD) &&-	CGIT_CONFIG="$PWD/patchcountrc" \-		QUERY_STRING="url=foo/patch&id=$id&id2=$root" cgit >tmp &&+	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD) &&+	CGIT_CONFIG="$PWD/patchcountrc" QUERY_STRING="url=foo/patch&id=$id&id2=$root" cgit >tmp && 	test $(grep -c "^From " tmp) -eq 2 ' 
diff --git a/tests/t0109-patch.sh b/tests/t0109-patch.sh
index 0982102..f4168f4 100755
--- a/tests/t0109-patch.sh
+++ b/tests/t0109-patch.sh
@@ -14,8 +14,7 @@ check_cgit_signature() {
 }
 
 # The version the built binary signs its patches with.
-CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" \
-	"$TEST_OUTPUT_DIRECTORY/../build/VERSION")
+CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" "$TEST_OUTPUT_DIRECTORY/../build/VERSION")
 
 test_expect_success 'generate foo/patch' '
 	cgit_query "url=foo/patch" >tmp
@@ -45,8 +44,7 @@ test_expect_success 'compare with output of git-format-patch(1)' '
 '
 
 test_expect_success 'find initial commit' '
-	root=$(git --git-dir="$PWD/repos/foo/.git" \
-		rev-list --max-parents=0 HEAD)
+	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD)
 '
 
 test_expect_success 'generate patch for initial commit' '
@@ -69,8 +67,7 @@ test_expect_success 'find `cgit` signature on the range' '
 
 test_expect_success 'compare the range with git-format-patch(1)' '
 	git --git-dir="$PWD/repos/foo/.git" format-patch --subject-prefix="" \
-		-N --signature="cgit $CGIT_VERSION" --stdout \
-		HEAD~3..HEAD >tmp2 &&
+		-N --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
 	strip_headers <tmp >tmp_ &&
 	test_cmp tmp_ tmp2
 '
@@ -83,10 +80,8 @@ test_expect_success 'max-patch-count bounds a patch range' '
 		echo "repo.path=$PWD/repos/foo/.git"
 	} >patchcountrc &&
 	id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
-	root=$(git --git-dir="$PWD/repos/foo/.git" \
-		rev-list --max-parents=0 HEAD) &&
-	CGIT_CONFIG="$PWD/patchcountrc" \
-		QUERY_STRING="url=foo/patch&id=$id&id2=$root" cgit >tmp &&
+	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD) &&
+	CGIT_CONFIG="$PWD/patchcountrc" QUERY_STRING="url=foo/patch&id=$id&id2=$root" cgit >tmp &&
 	test $(grep -c "^From " tmp) -eq 2
 '