Re: [PATCH 1/2] t7406: correct depth test in shallow test

From: Stefan Beller <sbeller@google.com>
Date: Jul 28, 2016, 18:47 UTC
Message-ID: <CAGZ79ka5n1_5CM3DOGHcd3W=4KJb9d-sb=E1pyvzP=XWGVXE3g@mail.gmail.com>
In-Reply-To: <xmqqeg6dsj33.fsf@gitster.mtv.corp.google.com>

On Thu, Jul 28, 2016 at 11:39 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

> Stefan Beller <sbeller@google.com> writes:
>
>> We used to ask for 3 changes and tested for having 1, so the test
>> seems broken.
>
> I am not sure what to think of "seems broken".

When asking for depth 3, I would expect a result of 1,2, or 3 commits.

But when testing the depth argument with a history less than 3, and then implying: "I got 1, which is less than 3, so the depth works", seems to be a logical shortcut to me.

I would have expected a history of >3, then ask for 3 and confirm we did not get 4 or 5 or 6, but 3 only.

Show 8 quoted lines

>
> Asking for 3 and having 1 is broken in what way?  Should we be
> expecting for 3 because we asked for that many?  Should we expect
> less than three even though we asked for three because the upstream
> side does not even have that many?  If the current test that asks
> for 3 and gets only 1 is not failing, why should we expect that
> asking for 2 would get 2?  In other words, why is it sane that
> asking for fewer number of commits gives us more?

I think there is a subtle thing going on, that I did not examine properly but it is hidden in the modernization from

    test 1 = $(something)
 to test_line_count = 2

I'll investigate the actual reason.

>
> Also most of the lines in this subshell seem to be breaking
> &&-chain.

Thanks for pointing that out, will fix while at it.

Show 27 quoted lines

>
>
>
>> Correct the test by using test_line_count that exists in the test suite.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>  t/t7406-submodule-update.sh | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
>> index 88e9750..bd261ac 100755
>> --- a/t/t7406-submodule-update.sh
>> +++ b/t/t7406-submodule-update.sh
>> @@ -846,9 +846,10 @@ test_expect_success 'submodule update clone shallow submodule' '
>>       (cd super3 &&
>>        sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
>>        mv -f .gitmodules.tmp .gitmodules &&
>> -      git submodule update --init --depth=3
>> +      git submodule update --init --depth=2
>>        (cd submodule &&
>> -       test 1 = $(git log --oneline | wc -l)
>> +       git log --oneline >lines
>> +       test_line_count = 2 lines
>>        )
>>  )
>>  '