Re: [PATCH 2/5] t/lib-submodule-update.sh: Fix test ignoring ignored files in submodules

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 22, 2017, 19:34 UTC
Message-ID: <xmqq7etesgju.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20171219222636.216001-3-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

> It turns out that this buggy test passed due to the buggy implementation,
> which will soon be corrected.  Let's fix the test first.

Please clarify "buggy test". Without the original discussion (I am imagining there is something that happened on the list recently), here is my guess:

    We tried to make sure that an ignored file is $distimmed by
    $gostak, but forgot to tell the exclude mechanism that the path
    'sub1'ignored' we use for the test is actually ignored, so the
    fact that the file was not $distimmed when $gostak did its thing
    meant nothing---mark any path whose name is 'ignored' as ignored
    to really test the condition we want to test.

but I do not exactly know what verb to replace $distim and what noun to replace $gostak above ;-)

Also, wouldn't this expose a bug in the implementation if that is the case?

Thanks.

Show 18 quoted lines

>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  t/lib-submodule-update.sh | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
> index d7699046f6..fb0173ea87 100755
> --- a/t/lib-submodule-update.sh
> +++ b/t/lib-submodule-update.sh
> @@ -885,6 +885,7 @@ test_submodule_switch_recursing_with_args () {
>  		(
>  			cd submodule_update &&
>  			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
> +			echo ignored >.git/modules/sub1/info/exclude &&
>  			: >sub1/ignored &&
>  			$command replace_sub1_with_file &&
>  			test_superproject_content origin/replace_sub1_with_file &&