Skip to content

Commit

Permalink
t2405: use git -C and test_commit -C instead of subshells
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
phil-blain authored and gitster committed Jan 22, 2020
1 parent 773c60a commit 4eaadc8
Showing 1 changed file with 9 additions and 25 deletions.
34 changes: 9 additions & 25 deletions t/t2405-worktree-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand Down

0 comments on commit 4eaadc8

Please sign in to comment.