Write the diff and patch checks as the suite does

1 file changed, 17 insertions, 17 deletions

diff --git a/tests/t0108-rawdiff.sh b/tests/t0108-rawdiff.shindex 500407f..9b4eb37 100755--- a/tests/t0108-rawdiff.sh+++ b/tests/t0108-rawdiff.sh@@ -12,13 +12,13 @@ test_expect_success 'generate foo/rawdiff' ' '  test_expect_success 'compare with output of git-diff(1)' '-	git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2 &&-	strip_headers <tmp >tmp_ &&-	cmp tmp_ tmp2+	git -C repos/foo diff HEAD^.. >expect &&+	strip_headers <tmp >actual &&+	test_cmp expect actual '  test_expect_success 'find initial commit' '-	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD)+	root=$(git -C repos/foo rev-list --max-parents=0 HEAD) '  test_expect_success 'generate diff for initial commit' '@@ -26,30 +26,30 @@ test_expect_success 'generate diff for initial commit' ' '  test_expect_success 'compare with output of git-diff-tree(1)' '-	git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2 &&-	strip_headers <tmp >tmp_ &&-	cmp tmp_ tmp2+	git -C repos/foo diff-tree -p --no-commit-id --root "$root" >expect &&+	strip_headers <tmp >actual &&+	test_cmp expect actual '  test_expect_success 'generate diff for multiple commits' '-	id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&-	id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&+	id=$(git -C repos/foo rev-parse HEAD) &&+	id2=$(git -C repos/foo rev-parse HEAD~3) && 	cgit_url "foo/rawdiff&id=$id&id2=$id2" >tmp '  test_expect_success 'compare with output of git-diff(1)' '-	git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2 &&-	strip_headers <tmp >tmp_ &&-	cmp tmp_ tmp2+	git -C repos/foo diff HEAD~3..HEAD >expect &&+	strip_headers <tmp >actual &&+	test_cmp expect actual '  test_expect_success 'a path limits the diff to that file' ' 	cgit_url "foo/rawdiff/file-4&id=$id&id2=$id2" >tmp &&-	git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD -- file-4 >tmp2 &&-	strip_headers <tmp >tmp_ &&-	cmp tmp_ tmp2 &&-	grep "file-4" tmp_ &&-	! grep "file-5" tmp_+	git -C repos/foo diff HEAD~3..HEAD -- file-4 >expect &&+	strip_headers <tmp >actual &&+	test_cmp expect actual &&+	grep "file-4" actual &&+	! grep "file-5" actual '  test_done
diff --git a/tests/t0108-rawdiff.sh b/tests/t0108-rawdiff.sh
index 500407f..9b4eb37 100755
--- a/tests/t0108-rawdiff.sh
+++ b/tests/t0108-rawdiff.sh
@@ -12,13 +12,13 @@ test_expect_success 'generate foo/rawdiff' '
 '
 
 test_expect_success 'compare with output of git-diff(1)' '
-	git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2 &&
-	strip_headers <tmp >tmp_ &&
-	cmp tmp_ tmp2
+	git -C repos/foo diff HEAD^.. >expect &&
+	strip_headers <tmp >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'find initial commit' '
-	root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD)
+	root=$(git -C repos/foo rev-list --max-parents=0 HEAD)
 '
 
 test_expect_success 'generate diff for initial commit' '
@@ -26,30 +26,30 @@ test_expect_success 'generate diff for initial commit' '
 '
 
 test_expect_success 'compare with output of git-diff-tree(1)' '
-	git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2 &&
-	strip_headers <tmp >tmp_ &&
-	cmp tmp_ tmp2
+	git -C repos/foo diff-tree -p --no-commit-id --root "$root" >expect &&
+	strip_headers <tmp >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'generate diff for multiple commits' '
-	id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
-	id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&
+	id=$(git -C repos/foo rev-parse HEAD) &&
+	id2=$(git -C repos/foo rev-parse HEAD~3) &&
 	cgit_url "foo/rawdiff&id=$id&id2=$id2" >tmp
 '
 
 test_expect_success 'compare with output of git-diff(1)' '
-	git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2 &&
-	strip_headers <tmp >tmp_ &&
-	cmp tmp_ tmp2
+	git -C repos/foo diff HEAD~3..HEAD >expect &&
+	strip_headers <tmp >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'a path limits the diff to that file' '
 	cgit_url "foo/rawdiff/file-4&id=$id&id2=$id2" >tmp &&
-	git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD -- file-4 >tmp2 &&
-	strip_headers <tmp >tmp_ &&
-	cmp tmp_ tmp2 &&
-	grep "file-4" tmp_ &&
-	! grep "file-5" tmp_
+	git -C repos/foo diff HEAD~3..HEAD -- file-4 >expect &&
+	strip_headers <tmp >actual &&
+	test_cmp expect actual &&
+	grep "file-4" actual &&
+	! grep "file-5" actual
 '
 
 test_done