t7407: Fix recursive submodule test
A test in t7404-submodule-foreach purports to test that the --cached flag is properly noticed by --recursive calls to the foreach command as it descends into nested submodules. However, the test really does not perform this test since the change it looks for is in a top-level submodule handled by the first invocation of the command. To properly test for the flag being passed to recursive invocations, the change must be buried deeper in the hierarchy. Move the change one level deeper so it properly verifies the recursive machinery of the 'git submodule status' command. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Jeff King <peff@peff.net>
Phil Hord committed
Oct 26, 2012 at 15:13 UTC
58ca9ad4d68951f5f04f7c2399be55590dcf6a59
1 file changed
+2
-2
t/t7407-submodule-foreach.sh
+2
-2
@@ -226,14 +226,14 @@ test_expect_success 'test "status --recursive"' '
226
test_cmp expect actual
227
'
228
229
-sed -e "/nested1 /s/.*/+$nested1sha1 nested1 (file2~1)/;/sub[1-3]/d" < expect > expect2
229
+sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2
230
mv -f expect2 expect
231
232
test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
233
(
234
cd clone3 &&
235
(
236
- cd nested1 &&
236
+ cd nested1/nested2 &&
237
test_commit file2
238
) &&
239
git submodule status --cached --recursive -- nested1 > ../actual