Beforecdab485(upload-pack: delegate rev walking in shallow fetch to pack-objects - 2013-08-16) upload-pack does not write to the source repository.cdab485starts to write $GIT_DIR/shallow_XXXXXX if it's a shallow fetch, so the source repo must be writable. git:// servers do not need write access to repos and usually don't have it, which meanscdab485breaks shallow clone over git:// Instead of using a temporary file as the media for shallow points, we can send them over stdin to pack-objects as well. Prepend shallow SHA-1 with --shallow so pack-objects knows what is what. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			218 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			218 lines
		
	
	
		
			4.1 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
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
 | 
						|
	say 'skipping remaining tests, git built without http support'
 | 
						|
	test_done
 | 
						|
fi
 | 
						|
 | 
						|
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'}
 | 
						|
. "$TEST_DIRECTORY"/lib-httpd.sh
 | 
						|
start_httpd
 | 
						|
 | 
						|
test_expect_success 'clone http repository' '
 | 
						|
	git clone --bare --no-local shallow "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 | 
						|
	git clone $HTTPD_URL/smart/repo.git clone &&
 | 
						|
	(
 | 
						|
	cd clone &&
 | 
						|
	git fsck &&
 | 
						|
	git log --format=%s origin/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 &&
 | 
						|
	find read-only.git -print | xargs chmod -w &&
 | 
						|
	test_when_finished "find read-only.git -type d -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
 | 
						|
'
 | 
						|
 | 
						|
stop_httpd
 | 
						|
test_done
 |