"git fetch" failed to correctly validate the set of objects it received when making a shallow history deeper, which has been corrected. * jt/connectivity-check-after-unshallow: fetch-pack: write shallow, then check connectivity fetch-pack: implement ref-in-want fetch-pack: put shallow info in output parameter fetch: refactor to make function args narrower fetch: refactor fetch_refs into two functions fetch: refactor the population of peer ref OIDs upload-pack: test negotiation with changing repository upload-pack: implement ref-in-want test-pkt-line: add unpack-sideband subcommand
		
			
				
	
	
		
			233 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			233 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='fetch/clone from a shallow clone'
 | 
						|
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
commit() {
 | 
						|
	echo "$1" >tracked &&
 | 
						|
	git add tracked &&
 | 
						|
	git commit -m "$1"
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'setup' '
 | 
						|
	commit 1 &&
 | 
						|
	commit 2 &&
 | 
						|
	commit 3 &&
 | 
						|
	commit 4 &&
 | 
						|
	git config --global transfer.fsckObjects true
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'setup shallow clone' '
 | 
						|
	git clone --no-local --depth=2 .git shallow &&
 | 
						|
	git --git-dir=shallow/.git log --format=%s >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'clone from shallow clone' '
 | 
						|
	git clone --no-local shallow shallow2 &&
 | 
						|
	(
 | 
						|
	cd shallow2 &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch from shallow clone' '
 | 
						|
	(
 | 
						|
	cd shallow &&
 | 
						|
	commit 5
 | 
						|
	) &&
 | 
						|
	(
 | 
						|
	cd shallow2 &&
 | 
						|
	git fetch &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s origin/master >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
5
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch --depth from shallow clone' '
 | 
						|
	(
 | 
						|
	cd shallow &&
 | 
						|
	commit 6
 | 
						|
	) &&
 | 
						|
	(
 | 
						|
	cd shallow2 &&
 | 
						|
	git fetch --depth=2 &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s origin/master >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
6
 | 
						|
5
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch --unshallow from shallow clone' '
 | 
						|
	(
 | 
						|
	cd shallow2 &&
 | 
						|
	git fetch --unshallow &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s origin/master >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
6
 | 
						|
5
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch something upstream has but hidden by clients shallow boundaries' '
 | 
						|
	# the blob "1" is available in .git but hidden by the
 | 
						|
	# shallow2/.git/shallow and it should be resent
 | 
						|
	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null &&
 | 
						|
	echo 1 >1.t &&
 | 
						|
	git add 1.t &&
 | 
						|
	git commit -m add-1-back &&
 | 
						|
	(
 | 
						|
	cd shallow2 &&
 | 
						|
	git fetch ../.git +refs/heads/master:refs/remotes/top/master &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s top/master >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
add-1-back
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	) &&
 | 
						|
	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
 | 
						|
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
 | 
						|
	(
 | 
						|
	cd shallow &&
 | 
						|
	git checkout --orphan no-shallow &&
 | 
						|
	commit no-shallow
 | 
						|
	) &&
 | 
						|
	git init notshallow &&
 | 
						|
	(
 | 
						|
	cd notshallow &&
 | 
						|
	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
 | 
						|
	git for-each-ref --format="%(refname)" >actual.refs &&
 | 
						|
	cat <<EOF >expect.refs &&
 | 
						|
refs/remotes/shallow/no-shallow
 | 
						|
EOF
 | 
						|
	test_cmp expect.refs actual.refs &&
 | 
						|
	git log --format=%s shallow/no-shallow >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
no-shallow
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'fetch --update-shallow' '
 | 
						|
	(
 | 
						|
	cd shallow &&
 | 
						|
	git checkout master &&
 | 
						|
	commit 7 &&
 | 
						|
	git tag -m foo heavy-tag HEAD^ &&
 | 
						|
	git tag light-tag HEAD^:tracked
 | 
						|
	) &&
 | 
						|
	(
 | 
						|
	cd notshallow &&
 | 
						|
	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
 | 
						|
	git fsck &&
 | 
						|
	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
 | 
						|
	cat <<EOF >expect.refs &&
 | 
						|
refs/remotes/shallow/master
 | 
						|
refs/remotes/shallow/no-shallow
 | 
						|
refs/tags/heavy-tag
 | 
						|
refs/tags/light-tag
 | 
						|
EOF
 | 
						|
	test_cmp expect.refs actual.refs &&
 | 
						|
	git log --format=%s shallow/master >actual &&
 | 
						|
	cat <<EOF >expect &&
 | 
						|
7
 | 
						|
6
 | 
						|
5
 | 
						|
4
 | 
						|
3
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' '
 | 
						|
	cp -R .git read-only.git &&
 | 
						|
	test_when_finished "find read-only.git -type d -print | xargs chmod +w" &&
 | 
						|
	find read-only.git -print | xargs chmod -w &&
 | 
						|
	git clone --no-local --depth=2 read-only.git from-read-only &&
 | 
						|
	git --git-dir=from-read-only/.git log --format=%s >actual &&
 | 
						|
	cat >expect <<EOF &&
 | 
						|
add-1-back
 | 
						|
4
 | 
						|
EOF
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
. "$TEST_DIRECTORY"/lib-httpd.sh
 | 
						|
start_httpd
 | 
						|
 | 
						|
REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
 | 
						|
 | 
						|
test_expect_success 'shallow fetches check connectivity before writing shallow file' '
 | 
						|
	rm -rf "$REPO" client &&
 | 
						|
 | 
						|
	git init "$REPO" &&
 | 
						|
	test_commit -C "$REPO" one &&
 | 
						|
	test_commit -C "$REPO" two &&
 | 
						|
	test_commit -C "$REPO" three &&
 | 
						|
 | 
						|
	git init client &&
 | 
						|
 | 
						|
	# Use protocol v2 to ensure that shallow information is sent exactly
 | 
						|
	# once by the server, since we are planning to manipulate it.
 | 
						|
	git -C "$REPO" config protocol.version 2 &&
 | 
						|
	git -C client config protocol.version 2 &&
 | 
						|
 | 
						|
	git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch &&
 | 
						|
 | 
						|
	# Craft a situation in which the server sends back an unshallow request
 | 
						|
	# with an empty packfile. This is done by refetching with a shorter
 | 
						|
	# depth (to ensure that the packfile is empty), and overwriting the
 | 
						|
	# shallow line in the response with the unshallow line we want.
 | 
						|
	printf "s/0034shallow %s/0036unshallow %s/" \
 | 
						|
	       "$(git -C "$REPO" rev-parse HEAD)" \
 | 
						|
	       "$(git -C "$REPO" rev-parse HEAD^)" \
 | 
						|
	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
 | 
						|
	test_must_fail git -C client fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \
 | 
						|
		master:a_branch &&
 | 
						|
 | 
						|
	# Ensure that the one-time-sed script was used.
 | 
						|
	! test -e "$HTTPD_ROOT_PATH/one-time-sed" &&
 | 
						|
 | 
						|
	# Ensure that the resulting repo is consistent, despite our failure to
 | 
						|
	# fetch.
 | 
						|
	git -C client fsck
 | 
						|
'
 | 
						|
 | 
						|
stop_httpd
 | 
						|
 | 
						|
test_done
 |