Web lists-archives.com

Re: [PATCH] upload-pack: teach deepen-relative in protocol v2




Junio C Hamano <gitster@xxxxxxxxx> writes:

> Josh Steadmon <steadmon@xxxxxxxxxx> writes:
>
>> Looks good to me.
>> Reviewed-by: Josh Steadmon <steadmon@xxxxxxxxxx>
>
> Thanks, both.

This, when applied on top of ecbdaf08991, seems to break t5702.30,
at least for me.

Tip of 'pu' in today's push-out will be broken as it has this patch
merged.

Can somebody take a look?


expecting success:
        rm -rf server client trace &&

        test_create_repo server &&
        test_commit -C server one &&
        test_commit -C server two &&
        test_commit -C server three &&
        git clone --depth 1 "file://$(pwd)/server" client &&
        test_commit -C server four &&

        # Sanity check that only "three" is downloaded
        git -C client log --pretty=tformat:%s master >actual &&
        echo three >expected &&
        test_cmp expected actual &&

        GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
                fetch --deepen=1 origin &&
        # Ensure that protocol v2 is used
        grep "fetch< version 2" trace &&

        git -C client log --pretty=tformat:%s origin/master >actual &&
        cat >expected <<-\EOF &&
        four
        three
        two
        EOF
        test_cmp expected actual

Initialized empty Git repository in /home/gitster/w/git.git/t/trash directory.t5702-protocol-v2/server/.git/
[master (root-commit) 1581e3e] one
 Author: A U Thor <author@xxxxxxxxxxx>
 1 file changed, 1 insertion(+)
 create mode 100644 one.t
[master 5680d21] two
 Author: A U Thor <author@xxxxxxxxxxx>
 1 file changed, 1 insertion(+)
 create mode 100644 two.t
[master 94705d7] three
 Author: A U Thor <author@xxxxxxxxxxx>
 1 file changed, 1 insertion(+)
 create mode 100644 three.t
Cloning into 'client'...
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (5/5), done.
[master 0b417c7] four
 Author: A U Thor <author@xxxxxxxxxxx>
 1 file changed, 1 insertion(+)
 create mode 100644 four.t
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 5 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
>From file:///home/gitster/w/git.git/t/trash directory.t5702-protocol-v2/server
   94705d7..0b417c7  master     -> origin/master
 * [new tag]         four       -> four
fatal: shallow file has changed since we read it
not ok 30 - deepen-relative