Fourth batch

diff --git a/t/t3050-subprojects-fetch.sh b/t/t3050-subprojects-fetch.sh
index 34f26a8d9ed809f07d1ae5eec847c2f0ac1d2b5e..f1f09abdd9b254eed1efa6b0d06369f3c8606cf8 100755 (executable)
--- a/t/t3050-subprojects-fetch.sh
+++ b/t/t3050-subprojects-fetch.sh
@@ -10,23 +10,23 @@ test_expect_success setup '
                cd sub &&
                git init &&
                >subfile &&
-               git add subfile
+               git add subfile &&
                git commit -m "subproject commit #1"
        ) &&
-       >mainfile
+       >mainfile &&
        git add sub mainfile &&
        test_tick &&
        git commit -m "superproject commit #1"
 '
 
 test_expect_success clone '
-       git clone file://`pwd`/.git cloned &&
-       (git rev-parse HEAD; git ls-files -s) >expected &&
+       git clone "file://$(pwd)/.git" cloned &&
+       (git rev-parse HEAD && git ls-files -s) >expected &&
        (
                cd cloned &&
-               (git rev-parse HEAD; git ls-files -s) >../actual
+               (git rev-parse HEAD && git ls-files -s) >../actual
        ) &&
-       diff -u expected actual
+       test_cmp expected actual
 '
 
 test_expect_success advance '
@@ -40,13 +40,13 @@ test_expect_success advance '
 '
 
 test_expect_success fetch '
-       (git rev-parse HEAD; git ls-files -s) >expected &&
+       (git rev-parse HEAD && git ls-files -s) >expected &&
        (
                cd cloned &&
                git pull &&
-               (git rev-parse HEAD; git ls-files -s) >../actual
+               (git rev-parse HEAD && git ls-files -s) >../actual
        ) &&
-       diff -u expected actual
+       test_cmp expected actual
 '
 
 test_done