Browse files

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

Move the change one level deeper so it properly verifies
the recursive machinery of the 'git submodule status'

Signed-off-by: Phil Hord <>
Signed-off-by: Jeff King <>
  • Loading branch information...
1 parent 7e20105 commit 58ca9ad4d68951f5f04f7c2399be55590dcf6a59 @phord phord committed with peff Oct 26, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 t/
@@ -226,14 +226,14 @@ test_expect_success 'test "status --recursive"' '
test_cmp expect actual
-sed -e "/nested1 /s/.*/+$nested1sha1 nested1 (file2~1)/;/sub[1-3]/d" < expect > expect2
+sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2
mv -f expect2 expect
test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
cd clone3 &&
- cd nested1 &&
+ cd nested1/nested2 &&
test_commit file2
) &&
git submodule status --cached --recursive -- nested1 > ../actual

0 comments on commit 58ca9ad

Please sign in to comment.