summaryrefslogtreecommitdiff
path: root/t/t7406-submodule-update.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:21 (GMT)
commit10639c395a365ab9e4f71a208746d9fc0236d2bb (patch)
tree5971c1a483830db44e8b9cd8326279db09a212d1 /t/t7406-submodule-update.sh
parentea30f539ef2092dee1b1c9e3aef8a934c0ce7c00 (diff)
parent0b7d324ee52a834261f3fcc6d2aa5a644eb2f955 (diff)
downloadgit-10639c395a365ab9e4f71a208746d9fc0236d2bb.zip
git-10639c395a365ab9e4f71a208746d9fc0236d2bb.tar.gz
git-10639c395a365ab9e4f71a208746d9fc0236d2bb.tar.bz2
Merge branch 'js/t7406-recursive-submodule-update-order-fix'
Test fix. * js/t7406-recursive-submodule-update-order-fix: t7406: avoid failures solely due to timing issues
Diffstat (limited to 't/t7406-submodule-update.sh')
-rwxr-xr-xt/t7406-submodule-update.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index f604ef7..686e6a4 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -115,17 +115,17 @@ Submodule path '../super/submodule': checked out '$submodulesha1'
EOF
cat <<EOF >expect2
+Cloning into '$pwd/recursivesuper/super/merging'...
+Cloning into '$pwd/recursivesuper/super/none'...
+Cloning into '$pwd/recursivesuper/super/rebasing'...
+Cloning into '$pwd/recursivesuper/super/submodule'...
Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
Submodule 'none' ($pwd/none) registered for path '../super/none'
Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
-Cloning into '$pwd/recursivesuper/super/merging'...
done.
-Cloning into '$pwd/recursivesuper/super/none'...
done.
-Cloning into '$pwd/recursivesuper/super/rebasing'...
done.
-Cloning into '$pwd/recursivesuper/super/submodule'...
done.
EOF
@@ -137,7 +137,8 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
git submodule update --init --recursive ../super >../../actual 2>../../actual2
) &&
test_i18ncmp expect actual &&
- test_i18ncmp expect2 actual2
+ sort actual2 >actual2.sorted &&
+ test_i18ncmp expect2 actual2.sorted
'
cat <<EOF >expect2