Skip to content

Commit 10639c3

Browse files
committed
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
2 parents ea30f53 + 0b7d324 commit 10639c3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

t/t7406-submodule-update.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ Submodule path '../super/submodule': checked out '$submodulesha1'
115115
EOF
116116

117117
cat <<EOF >expect2
118+
Cloning into '$pwd/recursivesuper/super/merging'...
119+
Cloning into '$pwd/recursivesuper/super/none'...
120+
Cloning into '$pwd/recursivesuper/super/rebasing'...
121+
Cloning into '$pwd/recursivesuper/super/submodule'...
118122
Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
119123
Submodule 'none' ($pwd/none) registered for path '../super/none'
120124
Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
121125
Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
122-
Cloning into '$pwd/recursivesuper/super/merging'...
123126
done.
124-
Cloning into '$pwd/recursivesuper/super/none'...
125127
done.
126-
Cloning into '$pwd/recursivesuper/super/rebasing'...
127128
done.
128-
Cloning into '$pwd/recursivesuper/super/submodule'...
129129
done.
130130
EOF
131131

@@ -137,7 +137,8 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
137137
git submodule update --init --recursive ../super >../../actual 2>../../actual2
138138
) &&
139139
test_i18ncmp expect actual &&
140-
test_i18ncmp expect2 actual2
140+
sort actual2 >actual2.sorted &&
141+
test_i18ncmp expect2 actual2.sorted
141142
'
142143

143144
cat <<EOF >expect2

0 commit comments

Comments
 (0)