From: Eddy Petrișor <eddy.petrisor@xxxxxxxxx> Signed-off-by: Eddy Petrișor <eddy.petrisor@xxxxxxxxx> --- t/t7406-submodule-update.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 7b65f1dd1..7fb370991 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -264,19 +264,13 @@ test_expect_success 'submodule update --remote --recursive --init should fetch m git clone super5 submodl2b2 && git clone super5 submodl1b1 && cd submodl2b2 && - echo linel2b2 > l2b2 && git checkout -b b2 && - git add l2b2 && - test_tick && - git commit -m "commit on b2 branch in l2" && + test_commit "l2_on_b2" && git rev-parse --verify HEAD >../expectl2 && git checkout master && cd ../submodl1b1 && git checkout -b b1 && - echo linel1b1 > l1b1 && - git add l1b1 && - test_tick && - git commit -m "commit on b1 branch in l1" && + test_commit "l1_on_b1" && git submodule add ../submodl2b2 submodl2b2 && git config -f .gitmodules submodule."submodl2b2".branch b2 && git add .gitmodules && @@ -286,10 +280,7 @@ test_expect_success 'submodule update --remote --recursive --init should fetch m git rev-parse --verify HEAD >../expectl1 && git checkout master && cd ../super5 && - echo super_with_2_chained_modules > super5 && - git add super5 && - test_tick && - git commit -m "commit on default branch in super5" && + test_commit super5_with_2_chained_modules_on_default_branch && git submodule add ../submodl1b1 submodl1b1 && git config -f .gitmodules submodule."submodl1b1".branch b1 && git add .gitmodules && -- 2.16.2
