t2405: use git -C and test_commit -C instead of subshells

The subshells used in the setup phase of this test are unnecessary.

Remove them by using 'git -C' and 'test_commit -C'.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2405-worktree-submodule.sh b/t/t2405-worktree-submodule.sh
index f2eee328cc4e187567219706004e31b8e2373e16..c4e555776a07ededed6f4c5d6f7c77723ec25b05 100755 (executable)
--- a/t/t2405-worktree-submodule.sh
+++ b/t/t2405-worktree-submodule.sh
@@ -6,32 +6,16 @@ test_description='Combination of submodules and multiple worktrees'
 
 base_path=$(pwd -P)
 
-test_expect_success 'setup: make origin'  '
-       mkdir -p origin/sub &&
-       (
-               cd origin/sub && git init &&
-               echo file1 >file1 &&
-               git add file1 &&
-               git commit -m file1
-       ) &&
-       mkdir -p origin/main &&
-       (
-               cd origin/main && git init &&
-               git submodule add ../sub &&
-               git commit -m "add sub"
-       ) &&
-       (
-               cd origin/sub &&
-               echo file1updated >file1 &&
-               git add file1 &&
-               git commit -m "file1 updated"
-       ) &&
+test_expect_success 'setup: create origin repos'  '
+       git init origin/sub &&
+       test_commit -C origin/sub file1 &&
+       git init origin/main &&
+       git -C origin/main submodule add ../sub &&
+       git -C origin/main commit -m "add sub" &&
+       test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
        git -C origin/main/sub pull &&
-       (
-               cd origin/main &&
-               git add sub &&
-               git commit -m "sub updated"
-       )
+       git -C origin/main add sub &&
+       git -C origin/main commit -m "sub updated"
 '
 
 test_expect_success 'setup: clone' '