From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:10 +0000 (+0900)
Subject: Merge branch 'jt/partial-clone-proto-v2'
X-Git-Tag: v2.18.0-rc0~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54db5c0e1edf0d92bd474f515fab349b98c18a24?hp=--cc

Merge branch 'jt/partial-clone-proto-v2'

Transfer protocol v2 learned to support the partial clone.

* jt/partial-clone-proto-v2:
{fetch,upload}-pack: support filter in protocol v2
upload-pack: read config when serving protocol v2
upload-pack: fix error message typo
---

54db5c0e1edf0d92bd474f515fab349b98c18a24
diff --cc t/t5701-git-serve.sh
index 011a5796db,1b4b13cc2b..75ec79e6cb
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@@ -174,24 -173,18 +174,38 @@@ test_expect_success 'symrefs parameter
  	test_cmp actual expect
  '
  
 +test_expect_success 'sending server-options' '
 +	test-pkt-line pack >in <<-EOF &&
 +	command=ls-refs
 +	server-option=hello
 +	server-option=world
 +	0001
 +	ref-prefix HEAD
 +	0000
 +	EOF
 +
 +	cat >expect <<-EOF &&
 +	$(git rev-parse HEAD) HEAD
 +	0000
 +	EOF
 +
 +	git serve --stateless-rpc <in >out &&
 +	test-pkt-line unpack <out >actual &&
 +	test_cmp actual expect
 +'
 +
+ test_expect_success 'unexpected lines are not allowed in fetch request' '
+ 	git init server &&
+ 
+ 	test-pkt-line pack >in <<-EOF &&
+ 	command=fetch
+ 	0001
+ 	this-is-not-a-command
+ 	0000
+ 	EOF
+ 
+ 	test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err &&
+ 	grep "unexpected line: .this-is-not-a-command." err
+ '
+ 
  test_done
diff --cc t/t5702-protocol-v2.sh
index dbfd0691c0,25bf046b36..4ad5c5769b
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@@ -217,22 -201,118 +217,134 @@@ test_expect_success 'ref advertisment i
  	! grep "refs/tags/three" log
  '
  
 +test_expect_success 'server-options are sent when fetching' '
 +	test_when_finished "rm -f log" &&
 +
 +	test_commit -C file_parent four &&
 +
 +	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
 +		fetch -o hello -o world origin master &&
 +
 +	git -C file_child log -1 --format=%s origin/master >actual &&
 +	git -C file_parent log -1 --format=%s >expect &&
 +	test_cmp expect actual &&
 +
 +	grep "server-option=hello" log &&
 +	grep "server-option=world" log
 +'
 +
+ test_expect_success 'upload-pack respects config using protocol v2' '
+ 	git init server &&
+ 	write_script server/.git/hook <<-\EOF &&
+ 		touch hookout
+ 		"$@"
+ 	EOF
+ 	test_commit -C server one &&
+ 
+ 	test_config_global uploadpack.packobjectshook ./hook &&
+ 	test_path_is_missing server/.git/hookout &&
+ 	git -c protocol.version=2 clone "file://$(pwd)/server" client &&
+ 	test_path_is_file server/.git/hookout
+ '
+ 
+ test_expect_success 'setup filter tests' '
+ 	rm -rf server client &&
+ 	git init server &&
+ 
+ 	# 1 commit to create a file, and 1 commit to modify it
+ 	test_commit -C server message1 a.txt &&
+ 	test_commit -C server message2 a.txt &&
+ 	git -C server config protocol.version 2 &&
+ 	git -C server config uploadpack.allowfilter 1 &&
+ 	git -C server config uploadpack.allowanysha1inwant 1 &&
+ 	git -C server config protocol.version 2
+ '
+ 
+ test_expect_success 'partial clone' '
+ 	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+ 		clone --filter=blob:none "file://$(pwd)/server" client &&
+ 	grep "version 2" trace &&
+ 
+ 	# Ensure that the old version of the file is missing
+ 	git -C client rev-list master --quiet --objects --missing=print \
+ 		>observed.oids &&
+ 	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
+ 
+ 	# Ensure that client passes fsck
+ 	git -C client fsck
+ '
+ 
+ test_expect_success 'dynamically fetch missing object' '
+ 	rm "$(pwd)/trace" &&
+ 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+ 		cat-file -p $(git -C server rev-parse message1:a.txt) &&
+ 	grep "version 2" trace
+ '
+ 
+ test_expect_success 'partial fetch' '
+ 	rm -rf client "$(pwd)/trace" &&
+ 	git init client &&
+ 	SERVER="file://$(pwd)/server" &&
+ 	test_config -C client extensions.partialClone "$SERVER" &&
+ 
+ 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+ 		fetch --filter=blob:none "$SERVER" master:refs/heads/other &&
+ 	grep "version 2" trace &&
+ 
+ 	# Ensure that the old version of the file is missing
+ 	git -C client rev-list other --quiet --objects --missing=print \
+ 		>observed.oids &&
+ 	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
+ 
+ 	# Ensure that client passes fsck
+ 	git -C client fsck
+ '
+ 
+ test_expect_success 'do not advertise filter if not configured to do so' '
+ 	SERVER="file://$(pwd)/server" &&
+ 
+ 	rm "$(pwd)/trace" &&
+ 	git -C server config uploadpack.allowfilter 1 &&
+ 	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+ 		ls-remote "$SERVER" &&
+ 	grep "fetch=.*filter" trace &&
+ 
+ 	rm "$(pwd)/trace" &&
+ 	git -C server config uploadpack.allowfilter 0 &&
+ 	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+ 		ls-remote "$SERVER" &&
+ 	grep "fetch=" trace >fetch_capabilities &&
+ 	! grep filter fetch_capabilities
+ '
+ 
+ test_expect_success 'partial clone warns if filter is not advertised' '
+ 	rm -rf client &&
+ 	git -C server config uploadpack.allowfilter 0 &&
+ 	git -c protocol.version=2 \
+ 		clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
+ 	test_i18ngrep "filtering not recognized by server, ignoring" err
+ '
+ 
+ test_expect_success 'even with handcrafted request, filter does not work if not advertised' '
+ 	git -C server config uploadpack.allowfilter 0 &&
+ 
+ 	# Custom request that tries to filter even though it is not advertised.
+ 	test-pkt-line pack >in <<-EOF &&
+ 	command=fetch
+ 	0001
+ 	want $(git -C server rev-parse master)
+ 	filter blob:none
+ 	0000
+ 	EOF
+ 
+ 	test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err &&
+ 	grep "unexpected line: .filter blob:none." err &&
+ 
+ 	# Exercise to ensure that if advertised, filter works
+ 	git -C server config uploadpack.allowfilter 1 &&
+ 	git -C server serve --stateless-rpc <in >/dev/null
+ '
+ 
  # Test protocol v2 with 'http://' transport
  #
  . "$TEST_DIRECTORY"/lib-httpd.sh