Re: [PATCH] diff: batch fetching of missing blobs
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- Mar 27, 2019, 10:10 UTC
- Message-ID
- <20190327101055.GB32732@szeder.dev>
- In-Reply-To
- <20190326220906.111879-1-jonathantanmy@google.com>
On Tue, Mar 26, 2019 at 03:09:06PM -0700, Jonathan Tan wrote:
Show 32 quoted lines
> diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
> new file mode 100755
> index 0000000000..38f03be114
> --- /dev/null
> +++ b/t/t4067-diff-partial-clone.sh
> @@ -0,0 +1,76 @@
> +#!/bin/sh
> +
> +test_description='behavior of diff when reading objects in a partial clone'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'git show batches blobs' '
> + test_create_repo server &&
> + echo a >server/a &&
> + echo b >server/b &&
> + git -C server add a b &&
> + git -C server commit -m x &&
> +
> + test_config -C server uploadpack.allowfilter 1 &&
> + test_config -C server uploadpack.allowanysha1inwant 1 &&
> + git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
> +
> + # Ensure that there is exactly 1 negotiation by checking that there is
> + # only 1 "done" line sent. ("done" marks the end of negotiation.)
> + GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
> + grep "git> done" trace >done_lines &&
> + test_line_count = 1 done_lines
> +'
> +
> +test_expect_success 'diff batches blobs' '
> + rm -rf server client trace &&Please use 'test_when_finished' in the previous test to clean up after itself.
Show 24 quoted lines
> +
> + test_create_repo server &&
> + echo a >server/a &&
> + echo b >server/b &&
> + git -C server add a b &&
> + git -C server commit -m x &&
> + echo c >server/c &&
> + echo d >server/d &&
> + git -C server add c d &&
> + git -C server commit -m x &&
> +
> + test_config -C server uploadpack.allowfilter 1 &&
> + test_config -C server uploadpack.allowanysha1inwant 1 &&
> + git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
> +
> + # Ensure that there is exactly 1 negotiation by checking that there is
> + # only 1 "done" line sent. ("done" marks the end of negotiation.)
> + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
> + grep "git> done" trace >done_lines &&
> + test_line_count = 1 done_lines
> +'
> +
> +test_expect_success 'diff skips same-OID blobs' '
> + rm -rf server client trace &&Likewise.
Show 28 quoted lines
> + test_create_repo server && > + echo a >server/a && > + echo b >server/b && > + git -C server add a b && > + git -C server commit -m x && > + echo another-a >server/a && > + git -C server add a && > + git -C server commit -m x && > + > + test_config -C server uploadpack.allowfilter 1 && > + test_config -C server uploadpack.allowanysha1inwant 1 && > + git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && > + > + echo a | git hash-object --stdin >hash-old-a && > + echo another-a | git hash-object --stdin >hash-new-a && > + echo b | git hash-object --stdin >hash-b && > + > + # Ensure that only a and another-a are fetched. > + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD && > + grep "want $(cat hash-old-a)" trace && > + grep "want $(cat hash-new-a)" trace && > + ! grep "want $(cat hash-b)" trace > +' > + > +test_done > -- > 2.21.0.155.ge902e9bcae.dirty >