mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Philippe Blain
2020-01-21 15:01:15 +00:00
committed by Junio C Hamano
parent 773c60a45e
commit 4eaadc8493
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
t/t2405-worktree-submodule.sh
View File

@ -6,32 +6,16 @@ test_description='Combination of submodules and multiple worktrees'
base_path=$(pwd -P) base_path=$(pwd -P)
test_expect_success 'setup: make origin' ' test_expect_success 'setup: create origin repos' '
mkdir -p origin/sub && git init origin/sub &&
( test_commit -C origin/sub file1 &&
cd origin/sub && git init && git init origin/main &&
echo file1 >file1 && git -C origin/main submodule add ../sub &&
git add file1 && git -C origin/main commit -m "add sub" &&
git commit -m file1 test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
) &&
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"
) &&
git -C origin/main/sub pull && git -C origin/main/sub pull &&
( git -C origin/main add sub &&
cd origin/main && git -C origin/main commit -m "sub updated"
git add sub &&
git commit -m "sub updated"
)
' '
test_expect_success 'setup: clone' ' test_expect_success 'setup: clone' '