Merge branch 'sb/t5614-modernize' into maint

Test clean-up.

* sb/t5614-modernize:
  t5614: don't use subshells

1 files changed, 20 insertions, 50 deletions

diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh
index a9aaa018ed..da2a67f656 100755
--- a/t/t5614-clone-submodules.sh
+++ b/t/t5614-clone-submodules.sh
@@ -25,76 +25,46 @@ test_expect_success 'setup' '
 test_expect_success 'nonshallow clone implies nonshallow submodule' '
         test_when_finished "rm -rf super_clone" &&
         git clone --recurse-submodules "file://$pwd/." super_clone &&
-        (
-                cd super_clone &&
-                git log --oneline >lines &&
-                test_line_count = 3 lines
-        ) &&
-        (
-                cd super_clone/sub &&
-                git log --oneline >lines &&
-                test_line_count = 3 lines
-        )
+        git -C super_clone log --oneline >lines &&
+        test_line_count = 3 lines &&
+        git -C super_clone/sub log --oneline >lines &&
+        test_line_count = 3 lines
 '
 
 test_expect_success 'shallow clone with shallow submodule' '
         test_when_finished "rm -rf super_clone" &&
         git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
-        (
-                cd super_clone &&
-                git log --oneline >lines &&
-                test_line_count = 2 lines
-        ) &&
-        (
-                cd super_clone/sub &&
-                git log --oneline >lines &&
-                test_line_count = 1 lines
-        )
+        git -C super_clone log --oneline >lines &&
+        test_line_count = 2 lines &&
+        git -C super_clone/sub log --oneline >lines &&
+        test_line_count = 1 lines
 '
 
 test_expect_success 'shallow clone does not imply shallow submodule' '
         test_when_finished "rm -rf super_clone" &&
         git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
-        (
-                cd super_clone &&
-                git log --oneline >lines &&
-                test_line_count = 2 lines
-        ) &&
-        (
-                cd super_clone/sub &&
-                git log --oneline >lines &&
-                test_line_count = 3 lines
-        )
+        git -C super_clone log --oneline >lines &&
+        test_line_count = 2 lines &&
+        git -C super_clone/sub log --oneline >lines &&
+        test_line_count = 3 lines
 '
 
 test_expect_success 'shallow clone with non shallow submodule' '
         test_when_finished "rm -rf super_clone" &&
         git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
-        (
-                cd super_clone &&
-                git log --oneline >lines &&
-                test_line_count = 2 lines
-        ) &&
-        (
-                cd super_clone/sub &&
-                git log --oneline >lines &&
-                test_line_count = 3 lines
-        )
+        git -C super_clone log --oneline >lines &&
+        test_line_count = 2 lines &&
+        git -C super_clone/sub log --oneline >lines &&
+        test_line_count = 3 lines
 '
 
 test_expect_success 'non shallow clone with shallow submodule' '
         test_when_finished "rm -rf super_clone" &&
         git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
-        (
-                cd super_clone &&
-                git log --oneline >lines &&
-                test_line_count = 3 lines
-        ) &&
-        (
-                cd super_clone/sub &&
-                git log --oneline >lines &&
-                test_line_count = 1 lines
-        )
+        git -C super_clone log --oneline >lines &&
+        test_line_count = 3 lines &&
+        git -C super_clone/sub log --oneline >lines &&
+        test_line_count = 1 lines
 '
 
 test_done