Re: [PATCH] t7407: Fix recursive submodule test
Am 26.10.2012 21:13, schrieb Phil Hord:
Show 13 quoted lines
> 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.
Me thinks we should definitely do this.
Show 27 quoted lines
> Signed-off-by: Phil Hord <hordp@cisco.com>
> ---
> t/t7407-submodule-foreach.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
> index 9b69fe2..107b4b7 100755
> --- a/t/t7407-submodule-foreach.sh
> +++ b/t/t7407-submodule-foreach.sh
> @@ -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
>
Jens Lehmann <jens.lehmann@web.de>