[thirdparty/git.git] / t / t5510-fetch.sh

#!/bin/sh
# Copyright (c) 2006, Junio C Hamano.

test_description='Per branch config variables affects "git fetch".

'

. ./test-lib.sh

D=`pwd`

test_bundle_object_count () {
	git verify-pack -v "$1" >verify.out &&
	test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
}

convert_bundle_to_pack () {
	while read x && test -n "$x"
	do
		:;
	done
	cat
}

test_expect_success setup '
	echo >file original &&
	git add file &&
	git commit -a -m original'

test_expect_success "clone and setup child repos" '
	git clone . one &&
	(
		cd one &&
		echo >file updated by one &&
		git commit -a -m "updated by one"
	) &&
	git clone . two &&
	(
		cd two &&
		git config branch.master.remote one &&
		git config remote.one.url ../one/.git/ &&
		git config remote.one.fetch refs/heads/master:refs/heads/one
	) &&
	git clone . three &&
	(
		cd three &&
		git config branch.master.remote two &&
		git config branch.master.merge refs/heads/one &&
		mkdir -p .git/remotes &&
		{
			echo "URL: ../two/.git/"
			echo "Pull: refs/heads/master:refs/heads/two"
			echo "Pull: refs/heads/one:refs/heads/one"
		} >.git/remotes/two
	) &&
	git clone . bundle &&
	git clone . seven
'

test_expect_success "fetch test" '
	cd "$D" &&
	echo >file updated by origin &&
	git commit -a -m "updated by origin" &&
	cd two &&
	git fetch &&
	test -f .git/refs/heads/one &&
	mine=`git rev-parse refs/heads/one` &&
	his=`cd ../one && git rev-parse refs/heads/master` &&
	test "z$mine" = "z$his"
'

test_expect_success "fetch test for-merge" '
	cd "$D" &&
	cd three &&
	git fetch &&
	test -f .git/refs/heads/two &&
	test -f .git/refs/heads/one &&
	master_in_two=`cd ../two && git rev-parse master` &&
	one_in_two=`cd ../two && git rev-parse one` &&
	{
		echo "$one_in_two	"
		echo "$master_in_two	not-for-merge"
	} >expected &&
	cut -f -2 .git/FETCH_HEAD >actual &&
	test_cmp expected actual'

test_expect_success 'fetch --prune on its own works as expected' '
	cd "$D" &&
	git clone . prune &&
	cd prune &&
	git update-ref refs/remotes/origin/extrabranch master &&

	git fetch --prune origin &&
	test_must_fail git rev-parse origin/extrabranch
'

test_expect_success 'fetch --prune with a branch name keeps branches' '
	cd "$D" &&
	git clone . prune-branch &&
	cd prune-branch &&
	git update-ref refs/remotes/origin/extrabranch master &&

	git fetch --prune origin master &&
	git rev-parse origin/extrabranch
'

test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
	cd "$D" &&
	git clone . prune-namespace &&
	cd prune-namespace &&

	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
	git rev-parse origin/master
'

test_expect_success 'fetch --prune --tags prunes tags and branches' '
	cd "$D" &&
	git clone . prune-tags &&
	cd prune-tags &&
	git tag sometag master &&
	# Create what looks like a remote-tracking branch from an earlier
	# fetch that has since been deleted from the remote:
	git update-ref refs/remotes/origin/fake-remote master &&

	git fetch --prune --tags origin &&
	git rev-parse origin/master &&
	test_must_fail git rev-parse origin/fake-remote &&
	test_must_fail git rev-parse sometag
'

test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' '
	cd "$D" &&
	git clone . prune-tags-branch &&
	cd prune-tags-branch &&
	git tag sometag master &&
	git update-ref refs/remotes/origin/extrabranch master &&

	git fetch --prune --tags origin master &&
	git rev-parse origin/extrabranch &&
	test_must_fail git rev-parse sometag
'

test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
	cd "$D" &&
	git clone . prune-tags-refspec &&
	cd prune-tags-refspec &&
	git tag sometag master &&
	git update-ref refs/remotes/origin/foo/otherbranch master &&
	git update-ref refs/remotes/origin/extrabranch master &&

	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
	git rev-parse origin/extrabranch &&
	test_must_fail git rev-parse sometag
'

test_expect_success 'fetch tags when there is no tags' '

    cd "$D" &&

    mkdir notags &&
    cd notags &&
    git init &&

    git fetch -t ..

'

test_expect_success 'fetch following tags' '

	cd "$D" &&
	git tag -a -m 'annotated' anno HEAD &&
	git tag light HEAD &&

	mkdir four &&
	cd four &&
	git init &&

	git fetch .. :track &&
	git show-ref --verify refs/tags/anno &&
	git show-ref --verify refs/tags/light

'

test_expect_success 'fetch uses remote ref names to describe new refs' '
	cd "$D" &&
	git init descriptive &&
	(
		cd descriptive &&
		git config remote.o.url .. &&
		git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
		git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
		git fetch o
	) &&
	git tag -a -m "Descriptive tag" descriptive-tag &&
	git branch descriptive-branch &&
	git checkout descriptive-branch &&
	echo "Nuts" >crazy &&
	git add crazy &&
	git commit -a -m "descriptive commit" &&
	git update-ref refs/others/crazy HEAD &&
	(
		cd descriptive &&
		git fetch o 2>actual &&
		grep " -> refs/crazyheads/descriptive-branch$" actual |
		test_i18ngrep "new branch" &&
		grep " -> descriptive-tag$" actual |
		test_i18ngrep "new tag" &&
		grep " -> crazy$" actual |
		test_i18ngrep "new ref"
	) &&
	git checkout master
'

test_expect_success 'fetch must not resolve short tag name' '

	cd "$D" &&

	mkdir five &&
	cd five &&
	git init &&

	test_must_fail git fetch .. anno:five

'

test_expect_success 'fetch can now resolve short remote name' '

	cd "$D" &&
	git update-ref refs/remotes/six/HEAD HEAD &&

	mkdir six &&
	cd six &&
	git init &&

	git fetch .. six:six
'

test_expect_success 'create bundle 1' '
	cd "$D" &&
	echo >file updated again by origin &&
	git commit -a -m "tip" &&
	git bundle create bundle1 master^..master
'

test_expect_success 'header of bundle looks right' '
	head -n 1 "$D"/bundle1 | grep "^#" &&
	head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
	head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
	head -n 4 "$D"/bundle1 | grep "^$"
'

test_expect_success 'create bundle 2' '
	cd "$D" &&
	git bundle create bundle2 master~2..master
'

test_expect_success 'unbundle 1' '
	cd "$D/bundle" &&
	git checkout -b some-branch &&
	test_must_fail git fetch "$D/bundle1" master:master
'


test_expect_success 'bundle 1 has only 3 files ' '
	cd "$D" &&
	convert_bundle_to_pack <bundle1 >bundle.pack &&
	git index-pack bundle.pack &&
	test_bundle_object_count bundle.pack 3
'

test_expect_success 'unbundle 2' '
	cd "$D/bundle" &&
	git fetch ../bundle2 master:master &&
	test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
'

test_expect_success 'bundle does not prerequisite objects' '
	cd "$D" &&
	touch file2 &&
	git add file2 &&
	git commit -m add.file2 file2 &&
	git bundle create bundle3 -1 HEAD &&
	convert_bundle_to_pack <bundle3 >bundle.pack &&
	git index-pack bundle.pack &&
	test_bundle_object_count bundle.pack 3
'

test_expect_success 'bundle should be able to create a full history' '

	cd "$D" &&
	git tag -a -m '1.0' v1.0 master &&
	git bundle create bundle4 v1.0

'

! rsync --help > /dev/null 2> /dev/null &&
say 'Skipping rsync tests because rsync was not found' || {
test_expect_success 'fetch via rsync' '
	git pack-refs &&
	mkdir rsynced &&
	(cd rsynced &&
	 git init --bare &&
	 git fetch "rsync:$(pwd)/../.git" master:refs/heads/master &&
	 git gc --prune &&
	 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	 git fsck --full)
'

test_expect_success 'push via rsync' '
	mkdir rsynced2 &&
	(cd rsynced2 &&
	 git init) &&
	(cd rsynced &&
	 git push "rsync:$(pwd)/../rsynced2/.git" master) &&
	(cd rsynced2 &&
	 git gc --prune &&
	 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	 git fsck --full)
'

test_expect_success 'push via rsync' '
	mkdir rsynced3 &&
	(cd rsynced3 &&
	 git init) &&
	git push --all "rsync:$(pwd)/rsynced3/.git" &&
	(cd rsynced3 &&
	 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	 git fsck --full)
'
}

test_expect_success 'fetch with a non-applying branch.<name>.merge' '
	git config branch.master.remote yeti &&
	git config branch.master.merge refs/heads/bigfoot &&
	git config remote.blub.url one &&
	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
	git fetch blub
'

# URL supplied to fetch does not match the url of the configured branch's remote
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
	one_head=$(cd one && git rev-parse HEAD) &&
	this_head=$(git rev-parse HEAD) &&
	git update-ref -d FETCH_HEAD &&
	git fetch one &&
	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	test $this_head = "$(git rev-parse --verify HEAD)"
'

# URL supplied to fetch matches the url of the configured branch's remote and
# the merge spec matches the branch the remote HEAD points to
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
	one_ref=$(cd one && git symbolic-ref HEAD) &&
	git config branch.master.remote blub &&
	git config branch.master.merge "$one_ref" &&
	git update-ref -d FETCH_HEAD &&
	git fetch one &&
	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	test $this_head = "$(git rev-parse --verify HEAD)"
'

# URL supplied to fetch matches the url of the configured branch's remote, but
# the merge spec does not match the branch the remote HEAD points to
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
	git config branch.master.merge "${one_ref}_not" &&
	git update-ref -d FETCH_HEAD &&
	git fetch one &&
	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	test $this_head = "$(git rev-parse --verify HEAD)"
'

# the strange name is: a\!'b
test_expect_success 'quoting of a strangely named repo' '
	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
	cat result &&
	grep "fatal: '\''a\\\\!'\''b'\''" result
'

test_expect_success 'bundle should record HEAD correctly' '

	cd "$D" &&
	git bundle create bundle5 HEAD master &&
	git bundle list-heads bundle5 >actual &&
	for h in HEAD refs/heads/master
	do
		echo "$(git rev-parse --verify $h) $h"
	done >expect &&
	test_cmp expect actual

'

test_expect_success 'mark initial state of origin/master' '
	(
		cd three &&
		git tag base-origin-master refs/remotes/origin/master
	)
'

test_expect_success 'explicit fetch should update tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		git update-ref refs/remotes/origin/master base-origin-master &&
		o=$(git rev-parse --verify refs/remotes/origin/master) &&
		git fetch origin master &&
		n=$(git rev-parse --verify refs/remotes/origin/master) &&
		test "$o" != "$n" &&
		test_must_fail git rev-parse --verify refs/remotes/origin/side
	)
'

test_expect_success 'explicit pull should update tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		git update-ref refs/remotes/origin/master base-origin-master &&
		o=$(git rev-parse --verify refs/remotes/origin/master) &&
		git pull origin master &&
		n=$(git rev-parse --verify refs/remotes/origin/master) &&
		test "$o" != "$n" &&
		test_must_fail git rev-parse --verify refs/remotes/origin/side
	)
'

test_expect_success 'configured fetch updates tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		git update-ref refs/remotes/origin/master base-origin-master &&
		o=$(git rev-parse --verify refs/remotes/origin/master) &&
		git fetch origin &&
		n=$(git rev-parse --verify refs/remotes/origin/master) &&
		test "$o" != "$n" &&
		git rev-parse --verify refs/remotes/origin/side
	)
'

test_expect_success 'non-matching refspecs do not confuse tracking update' '
	cd "$D" &&
	git update-ref refs/odd/location HEAD &&
	(
		cd three &&
		git update-ref refs/remotes/origin/master base-origin-master &&
		git config --add remote.origin.fetch \
			refs/odd/location:refs/remotes/origin/odd &&
		o=$(git rev-parse --verify refs/remotes/origin/master) &&
		git fetch origin master &&
		n=$(git rev-parse --verify refs/remotes/origin/master) &&
		test "$o" != "$n" &&
		test_must_fail git rev-parse --verify refs/remotes/origin/odd
	)
'

test_expect_success 'pushing nonexistent branch by mistake should not segv' '

	cd "$D" &&
	test_must_fail git push seven no:no

'

test_expect_success 'auto tag following fetches minimum' '

	cd "$D" &&
	git clone .git follow &&
	git checkout HEAD^0 &&
	(
		for i in 1 2 3 4 5 6 7
		do
			echo $i >>file &&
			git commit -m $i -a &&
			git tag -a -m $i excess-$i || exit 1
		done
	) &&
	git checkout master &&
	(
		cd follow &&
		git fetch
	)
'

test_expect_success 'refuse to fetch into the current branch' '

	test_must_fail git fetch . side:master

'

test_expect_success 'fetch into the current branch with --update-head-ok' '

	git fetch --update-head-ok . side:master

'

test_expect_success 'fetch --dry-run' '

	rm -f .git/FETCH_HEAD &&
	git fetch --dry-run . &&
	! test -f .git/FETCH_HEAD
'

test_expect_success "should be able to fetch with duplicate refspecs" '
	mkdir dups &&
	(
		cd dups &&
		git init &&
		git config branch.master.remote three &&
		git config remote.three.url ../three/.git &&
		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
		git fetch three
	)
'

# configured prune tests

set_config_tristate () {
	# var=$1 val=$2
	case "$2" in
	unset)  test_unconfig "$1" ;;
	*)	git config "$1" "$2" ;;
	esac
}

test_configured_prune () {
	fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4

	test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
		# make sure a newbranch is there in . and also in one
		git branch -f newbranch &&
		(
			cd one &&
			test_unconfig fetch.prune &&
			test_unconfig remote.origin.prune &&
			git fetch &&
			git rev-parse --verify refs/remotes/origin/newbranch
		)

		# now remove it
		git branch -d newbranch &&

		# then test
		(
			cd one &&
			set_config_tristate fetch.prune $fetch_prune &&
			set_config_tristate remote.origin.prune $remote_origin_prune &&

			git fetch $cmdline &&
			case "$expected" in
			pruned)
				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
				;;
			kept)
				git rev-parse --verify refs/remotes/origin/newbranch
				;;
			esac
		)
	'
}

test_configured_prune unset unset ""		kept
test_configured_prune unset unset "--no-prune"	kept
test_configured_prune unset unset "--prune"	pruned

test_configured_prune false unset ""		kept
test_configured_prune false unset "--no-prune"	kept
test_configured_prune false unset "--prune"	pruned

test_configured_prune true  unset ""		pruned
test_configured_prune true  unset "--prune"	pruned
test_configured_prune true  unset "--no-prune"	kept

test_configured_prune unset false ""		kept
test_configured_prune unset false "--no-prune"	kept
test_configured_prune unset false "--prune"	pruned

test_configured_prune false false ""		kept
test_configured_prune false false "--no-prune"	kept
test_configured_prune false false "--prune"	pruned

test_configured_prune true  false ""		kept
test_configured_prune true  false "--prune"	pruned
test_configured_prune true  false "--no-prune"	kept

test_configured_prune unset true  ""		pruned
test_configured_prune unset true  "--no-prune"	kept
test_configured_prune unset true  "--prune"	pruned

test_configured_prune false true  ""		pruned
test_configured_prune false true  "--no-prune"	kept
test_configured_prune false true  "--prune"	pruned

test_configured_prune true  true  ""		pruned
test_configured_prune true  true  "--prune"	pruned
test_configured_prune true  true  "--no-prune"	kept

test_expect_success 'all boundary commits are excluded' '
	test_commit base &&
	test_commit oneside &&
	git checkout HEAD^ &&
	test_commit otherside &&
	git checkout master &&
	test_tick &&
	git merge otherside &&
	ad=$(git log --no-walk --format=%ad HEAD) &&
	git bundle create twoside-boundary.bdl master --since="$ad" &&
	convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
	pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
	test_bundle_object_count .git/objects/pack/pack-${pack##pack	}.pack 3
'

test_done
Commit	Line	Data
7be1d62c JH	1	#!/bin/sh
	2	# Copyright (c) 2006, Junio C Hamano.
	3
	4	test_description='Per branch config variables affects "git fetch".
	5
	6	'
	7
	8	. ./test-lib.sh
	9
	10	D=`pwd`
	11
2e674a9d JH	12	test_bundle_object_count () {
	13	git verify-pack -v "$1" >verify.out &&
	14	test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out \| wc -l)
	15	}
	16
61821aaa TR	17	convert_bundle_to_pack () {
	18	while read x && test -n "$x"
	19	do
	20	:;
	21	done
	22	cat
	23	}
	24
7be1d62c JH	25	test_expect_success setup '
	26	echo >file original &&
	27	git add file &&
	28	git commit -a -m original'
	29
	30	test_expect_success "clone and setup child repos" '
	31	git clone . one &&
18a82692 JN	32	(
	33	cd one &&
	34	echo >file updated by one &&
	35	git commit -a -m "updated by one"
fd4ec4f2	36	) &&
7be1d62c	37	git clone . two &&
18a82692 JN	38	(
	39	cd two &&
	40	git config branch.master.remote one &&
	41	git config remote.one.url ../one/.git/ &&
	42	git config remote.one.fetch refs/heads/master:refs/heads/one
fd4ec4f2	43	) &&
6cc7c36d	44	git clone . three &&
18a82692 JN	45	(
	46	cd three &&
	47	git config branch.master.remote two &&
	48	git config branch.master.merge refs/heads/one &&
	49	mkdir -p .git/remotes &&
	50	{
	51	echo "URL: ../two/.git/"
	52	echo "Pull: refs/heads/master:refs/heads/two"
	53	echo "Pull: refs/heads/one:refs/heads/one"
	54	} >.git/remotes/two
fd4ec4f2	55	) &&
9a7bbd1d JK	56	git clone . bundle &&
9a7bbd1d JK	57	git clone . seven
7be1d62c JH	58	'
	59
	60	test_expect_success "fetch test" '
	61	cd "$D" &&
	62	echo >file updated by origin &&
	63	git commit -a -m "updated by origin" &&
	64	cd two &&
	65	git fetch &&
	66	test -f .git/refs/heads/one &&
	67	mine=`git rev-parse refs/heads/one` &&
	68	his=`cd ../one && git rev-parse refs/heads/master` &&
	69	test "z$mine" = "z$his"
	70	'
	71
6cc7c36d SB	72	test_expect_success "fetch test for-merge" '
	73	cd "$D" &&
	74	cd three &&
	75	git fetch &&
	76	test -f .git/refs/heads/two &&
	77	test -f .git/refs/heads/one &&
	78	master_in_two=`cd ../two && git rev-parse master` &&
	79	one_in_two=`cd ../two && git rev-parse one` &&
	80	{
6cc7c36d	81	echo "$one_in_two "
96890f4c	82	echo "$master_in_two not-for-merge"
6cc7c36d SB	83	} >expected &&
6cc7c36d SB	84	cut -f -2 .git/FETCH_HEAD >actual &&
4fdf71be	85	test_cmp expected actual'
6cc7c36d	86
43a8a04a CMN	87	test_expect_success 'fetch --prune on its own works as expected' '
	88	cd "$D" &&
	89	git clone . prune &&
	90	cd prune &&
d0d06e89	91	git update-ref refs/remotes/origin/extrabranch master &&
43a8a04a CMN	92
	93	git fetch --prune origin &&
	94	test_must_fail git rev-parse origin/extrabranch
	95	'
	96
ed43de6e	97	test_expect_success 'fetch --prune with a branch name keeps branches' '
43a8a04a CMN	98	cd "$D" &&
	99	git clone . prune-branch &&
	100	cd prune-branch &&
d0d06e89	101	git update-ref refs/remotes/origin/extrabranch master &&
43a8a04a CMN	102
	103	git fetch --prune origin master &&
	104	git rev-parse origin/extrabranch
	105	'
	106
ed43de6e	107	test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
43a8a04a CMN	108	cd "$D" &&
	109	git clone . prune-namespace &&
	110	cd prune-namespace &&
	111
	112	git fetch --prune origin refs/heads/a/:refs/remotes/origin/a/ &&
	113	git rev-parse origin/master
	114	'
	115
c5a84e92	116	test_expect_success 'fetch --prune --tags prunes tags and branches' '
43a8a04a CMN	117	cd "$D" &&
	118	git clone . prune-tags &&
	119	cd prune-tags &&
d0d06e89	120	git tag sometag master &&
68a304d5 MH	121	# Create what looks like a remote-tracking branch from an earlier
	122	# fetch that has since been deleted from the remote:
	123	git update-ref refs/remotes/origin/fake-remote master &&
43a8a04a CMN	124
	125	git fetch --prune --tags origin &&
	126	git rev-parse origin/master &&
c5a84e92	127	test_must_fail git rev-parse origin/fake-remote &&
2004658b	128	test_must_fail git rev-parse sometag
43a8a04a CMN	129	'
43a8a04a CMN	130
e8c1e6c7	131	test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' '
43a8a04a CMN	132	cd "$D" &&
	133	git clone . prune-tags-branch &&
	134	cd prune-tags-branch &&
c5a84e92	135	git tag sometag master &&
d0d06e89	136	git update-ref refs/remotes/origin/extrabranch master &&
43a8a04a CMN	137
43a8a04a CMN	138	git fetch --prune --tags origin master &&
c5a84e92 MH	139	git rev-parse origin/extrabranch &&
	140	test_must_fail git rev-parse sometag
	141	'
	142
	143	test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
	144	cd "$D" &&
	145	git clone . prune-tags-refspec &&
	146	cd prune-tags-refspec &&
	147	git tag sometag master &&
	148	git update-ref refs/remotes/origin/foo/otherbranch master &&
	149	git update-ref refs/remotes/origin/extrabranch master &&
	150
	151	git fetch --prune --tags origin refs/heads/foo/:refs/remotes/origin/foo/ &&
	152	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
	153	git rev-parse origin/extrabranch &&
	154	test_must_fail git rev-parse sometag
43a8a04a CMN	155	'
43a8a04a CMN	156
f539d0d6 VJ	157	test_expect_success 'fetch tags when there is no tags' '
	158
	159	cd "$D" &&
	160
	161	mkdir notags &&
	162	cd notags &&
	163	git init &&
	164
	165	git fetch -t ..
	166
	167	'
	168
6c96c0f1 JH	169	test_expect_success 'fetch following tags' '
	170
	171	cd "$D" &&
	172	git tag -a -m 'annotated' anno HEAD &&
	173	git tag light HEAD &&
	174
	175	mkdir four &&
	176	cd four &&
5c94f87e	177	git init &&
6c96c0f1 JH	178
	179	git fetch .. :track &&
	180	git show-ref --verify refs/tags/anno &&
	181	git show-ref --verify refs/tags/light
	182
	183	'
	184
0997adaa MB	185	test_expect_success 'fetch uses remote ref names to describe new refs' '
	186	cd "$D" &&
	187	git init descriptive &&
	188	(
	189	cd descriptive &&
	190	git config remote.o.url .. &&
	191	git config remote.o.fetch "refs/heads/:refs/crazyheads/" &&
	192	git config --add remote.o.fetch "refs/others/:refs/heads/" &&
	193	git fetch o
	194	) &&
	195	git tag -a -m "Descriptive tag" descriptive-tag &&
	196	git branch descriptive-branch &&
	197	git checkout descriptive-branch &&
	198	echo "Nuts" >crazy &&
	199	git add crazy &&
	200	git commit -a -m "descriptive commit" &&
	201	git update-ref refs/others/crazy HEAD &&
	202	(
	203	cd descriptive &&
	204	git fetch o 2>actual &&
	205	grep " -> refs/crazyheads/descriptive-branch$" actual \|
	206	test_i18ngrep "new branch" &&
	207	grep " -> descriptive-tag$" actual \|
	208	test_i18ngrep "new tag" &&
	209	grep " -> crazy$" actual \|
	210	test_i18ngrep "new ref"
	211	) &&
	212	git checkout master
	213	'
	214
41ac414e	215	test_expect_success 'fetch must not resolve short tag name' '
605b4978 SP	216
	217	cd "$D" &&
	218
	219	mkdir five &&
	220	cd five &&
	221	git init &&
	222
d492b31c	223	test_must_fail git fetch .. anno:five
605b4978 SP	224
	225	'
	226
dd621df9	227	test_expect_success 'fetch can now resolve short remote name' '
605b4978 SP	228
605b4978 SP	229	cd "$D" &&
a48fcd83	230	git update-ref refs/remotes/six/HEAD HEAD &&
605b4978 SP	231
	232	mkdir six &&
	233	cd six &&
	234	git init &&
	235
dd621df9	236	git fetch .. six:six
605b4978 SP	237	'
605b4978 SP	238
2e0afafe JS	239	test_expect_success 'create bundle 1' '
	240	cd "$D" &&
	241	echo >file updated again by origin &&
	242	git commit -a -m "tip" &&
	243	git bundle create bundle1 master^..master
	244	'
	245
8315588b JS	246	test_expect_success 'header of bundle looks right' '
	247	head -n 1 "$D"/bundle1 \| grep "^#" &&
	248	head -n 2 "$D"/bundle1 \| grep "^-[0-9a-f]\{40\} " &&
	249	head -n 3 "$D"/bundle1 \| grep "^[0-9a-f]\{40\} " &&
	250	head -n 4 "$D"/bundle1 \| grep "^$"
	251	'
	252
2e0afafe JS	253	test_expect_success 'create bundle 2' '
	254	cd "$D" &&
	255	git bundle create bundle2 master~2..master
	256	'
	257
41ac414e	258	test_expect_success 'unbundle 1' '
2e0afafe JS	259	cd "$D/bundle" &&
2e0afafe JS	260	git checkout -b some-branch &&
d492b31c	261	test_must_fail git fetch "$D/bundle1" master:master
2e0afafe JS	262	'
2e0afafe JS	263
2e674a9d	264
8315588b JS	265	test_expect_success 'bundle 1 has only 3 files ' '
8315588b JS	266	cd "$D" &&
61821aaa	267	convert_bundle_to_pack <bundle1 >bundle.pack &&
8315588b	268	git index-pack bundle.pack &&
2e674a9d	269	test_bundle_object_count bundle.pack 3
8315588b JS	270	'
8315588b JS	271
2e0afafe JS	272	test_expect_success 'unbundle 2' '
	273	cd "$D/bundle" &&
	274	git fetch ../bundle2 master:master &&
	275	test "tip" = "$(git log -1 --pretty=oneline master \| cut -b42-)"
	276	'
	277
18449ab0 JS	278	test_expect_success 'bundle does not prerequisite objects' '
	279	cd "$D" &&
	280	touch file2 &&
	281	git add file2 &&
	282	git commit -m add.file2 file2 &&
	283	git bundle create bundle3 -1 HEAD &&
61821aaa	284	convert_bundle_to_pack <bundle3 >bundle.pack &&
18449ab0	285	git index-pack bundle.pack &&
2e674a9d	286	test_bundle_object_count bundle.pack 3
18449ab0 JS	287	'
18449ab0 JS	288
7fa8254f JH	289	test_expect_success 'bundle should be able to create a full history' '
	290
	291	cd "$D" &&
	292	git tag -a -m '1.0' v1.0 master &&
	293	git bundle create bundle4 v1.0
	294
	295	'
	296
7efaeba2 JS	297	! rsync --help > /dev/null 2> /dev/null &&
7efaeba2 JS	298	say 'Skipping rsync tests because rsync was not found' \|\| {
cd547b48 JS	299	test_expect_success 'fetch via rsync' '
	300	git pack-refs &&
	301	mkdir rsynced &&
7efaeba2 JS	302	(cd rsynced &&
	303	git init --bare &&
	304	git fetch "rsync:$(pwd)/../.git" master:refs/heads/master &&
	305	git gc --prune &&
	306	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	307	git fsck --full)
cd547b48 JS	308	'
	309
	310	test_expect_success 'push via rsync' '
7efaeba2 JS	311	mkdir rsynced2 &&
7efaeba2 JS	312	(cd rsynced2 &&
cd547b48	313	git init) &&
7efaeba2 JS	314	(cd rsynced &&
	315	git push "rsync:$(pwd)/../rsynced2/.git" master) &&
	316	(cd rsynced2 &&
	317	git gc --prune &&
	318	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	319	git fsck --full)
cd547b48 JS	320	'
	321
	322	test_expect_success 'push via rsync' '
cd547b48 JS	323	mkdir rsynced3 &&
	324	(cd rsynced3 &&
	325	git init) &&
7efaeba2 JS	326	git push --all "rsync:$(pwd)/rsynced3/.git" &&
	327	(cd rsynced3 &&
	328	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	329	git fsck --full)
cd547b48 JS	330	'
	331	}
	332
da0204df JS	333	test_expect_success 'fetch with a non-applying branch.<name>.merge' '
	334	git config branch.master.remote yeti &&
	335	git config branch.master.merge refs/heads/bigfoot &&
	336	git config remote.blub.url one &&
	337	git config remote.blub.fetch "refs/heads/:refs/remotes/one/" &&
	338	git fetch blub
	339	'
	340
042cca38 BC	341	# URL supplied to fetch does not match the url of the configured branch's remote
	342	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
	343	one_head=$(cd one && git rev-parse HEAD) &&
	344	this_head=$(git rev-parse HEAD) &&
6106ce46 BC	345	git update-ref -d FETCH_HEAD &&
6106ce46 BC	346	git fetch one &&
042cca38 BC	347	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	348	test $this_head = "$(git rev-parse --verify HEAD)"
	349	'
	350
	351	# URL supplied to fetch matches the url of the configured branch's remote and
	352	# the merge spec matches the branch the remote HEAD points to
	353	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
	354	one_ref=$(cd one && git symbolic-ref HEAD) &&
	355	git config branch.master.remote blub &&
	356	git config branch.master.merge "$one_ref" &&
	357	git update-ref -d FETCH_HEAD &&
	358	git fetch one &&
	359	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	360	test $this_head = "$(git rev-parse --verify HEAD)"
	361	'
	362
	363	# URL supplied to fetch matches the url of the configured branch's remote, but
	364	# the merge spec does not match the branch the remote HEAD points to
	365	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
	366	git config branch.master.merge "${one_ref}_not" &&
	367	git update-ref -d FETCH_HEAD &&
	368	git fetch one &&
	369	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	370	test $this_head = "$(git rev-parse --verify HEAD)"
6106ce46 BC	371	'
6106ce46 BC	372
c2015b3a JS	373	# the strange name is: a\!'b
c2015b3a JS	374	test_expect_success 'quoting of a strangely named repo' '
d492b31c	375	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
c2015b3a JS	376	cat result &&
	377	grep "fatal: '\''a\\\\!'\''b'\''" result
	378	'
	379
c5546e88 JS	380	test_expect_success 'bundle should record HEAD correctly' '
	381
	382	cd "$D" &&
	383	git bundle create bundle5 HEAD master &&
	384	git bundle list-heads bundle5 >actual &&
	385	for h in HEAD refs/heads/master
	386	do
	387	echo "$(git rev-parse --verify $h) $h"
	388	done >expect &&
82ebb0b6	389	test_cmp expect actual
c5546e88 JS	390
	391	'
	392
51f8c814 JK	393	test_expect_success 'mark initial state of origin/master' '
	394	(
	395	cd three &&
	396	git tag base-origin-master refs/remotes/origin/master
	397	)
	398	'
	399
f2690487	400	test_expect_success 'explicit fetch should update tracking' '
c7015961 JH	401
	402	cd "$D" &&
	403	git branch -f side &&
	404	(
	405	cd three &&
51f8c814	406	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	407	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	408	git fetch origin master &&
	409	n=$(git rev-parse --verify refs/remotes/origin/master) &&
f2690487	410	test "$o" != "$n" &&
d492b31c	411	test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961 JH	412	)
	413	'
	414
f2690487	415	test_expect_success 'explicit pull should update tracking' '
c7015961 JH	416
	417	cd "$D" &&
	418	git branch -f side &&
	419	(
	420	cd three &&
51f8c814	421	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	422	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	423	git pull origin master &&
	424	n=$(git rev-parse --verify refs/remotes/origin/master) &&
f2690487	425	test "$o" != "$n" &&
d492b31c	426	test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961 JH	427	)
	428	'
	429
	430	test_expect_success 'configured fetch updates tracking' '
	431
	432	cd "$D" &&
	433	git branch -f side &&
	434	(
	435	cd three &&
51f8c814	436	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	437	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	438	git fetch origin &&
	439	n=$(git rev-parse --verify refs/remotes/origin/master) &&
	440	test "$o" != "$n" &&
	441	git rev-parse --verify refs/remotes/origin/side
	442	)
	443	'
	444
823c6d56 JK	445	test_expect_success 'non-matching refspecs do not confuse tracking update' '
	446	cd "$D" &&
	447	git update-ref refs/odd/location HEAD &&
	448	(
	449	cd three &&
	450	git update-ref refs/remotes/origin/master base-origin-master &&
	451	git config --add remote.origin.fetch \
	452	refs/odd/location:refs/remotes/origin/odd &&
	453	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	454	git fetch origin master &&
	455	n=$(git rev-parse --verify refs/remotes/origin/master) &&
	456	test "$o" != "$n" &&
	457	test_must_fail git rev-parse --verify refs/remotes/origin/odd
	458	)
	459	'
	460
9a7bbd1d JK	461	test_expect_success 'pushing nonexistent branch by mistake should not segv' '
	462
	463	cd "$D" &&
	464	test_must_fail git push seven no:no
	465
	466	'
	467
49420252 JH	468	test_expect_success 'auto tag following fetches minimum' '
	469
	470	cd "$D" &&
	471	git clone .git follow &&
	472	git checkout HEAD^0 &&
	473	(
	474	for i in 1 2 3 4 5 6 7
	475	do
	476	echo $i >>file &&
	477	git commit -m $i -a &&
	478	git tag -a -m $i excess-$i \|\| exit 1
	479	done
	480	) &&
	481	git checkout master &&
	482	(
	483	cd follow &&
	484	git fetch
	485	)
	486	'
	487
8ee5d731 JS	488	test_expect_success 'refuse to fetch into the current branch' '
	489
	490	test_must_fail git fetch . side:master
	491
	492	'
	493
	494	test_expect_success 'fetch into the current branch with --update-head-ok' '
	495
	496	git fetch --update-head-ok . side:master
	497
	498	'
	499
3fdcdbdf JS	500	test_expect_success 'fetch --dry-run' '
	501
	502	rm -f .git/FETCH_HEAD &&
	503	git fetch --dry-run . &&
	504	! test -f .git/FETCH_HEAD
	505	'
	506
95c96d48	507	test_expect_success "should be able to fetch with duplicate refspecs" '
aa982856 TR	508	mkdir dups &&
	509	(
	510	cd dups &&
	511	git init &&
	512	git config branch.master.remote three &&
	513	git config remote.three.url ../three/.git &&
	514	git config remote.three.fetch +refs/heads/:refs/remotes/origin/ &&
	515	git config --add remote.three.fetch +refs/heads/:refs/remotes/origin/ &&
	516	git fetch three
	517	)
95c96d48 JP	518	'
95c96d48 JP	519
737c5a9c MS	520	# configured prune tests
	521
	522	set_config_tristate () {
	523	# var=$1 val=$2
	524	case "$2" in
	525	unset) test_unconfig "$1" ;;
	526	*) git config "$1" "$2" ;;
	527	esac
	528	}
	529
	530	test_configured_prune () {
	531	fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4
	532
	533	test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
	534	# make sure a newbranch is there in . and also in one
	535	git branch -f newbranch &&
	536	(
	537	cd one &&
	538	test_unconfig fetch.prune &&
	539	test_unconfig remote.origin.prune &&
	540	git fetch &&
	541	git rev-parse --verify refs/remotes/origin/newbranch
	542	)
	543
	544	# now remove it
	545	git branch -d newbranch &&
	546
	547	# then test
	548	(
	549	cd one &&
	550	set_config_tristate fetch.prune $fetch_prune &&
	551	set_config_tristate remote.origin.prune $remote_origin_prune &&
	552
	553	git fetch $cmdline &&
	554	case "$expected" in
	555	pruned)
	556	test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
	557	;;
	558	kept)
	559	git rev-parse --verify refs/remotes/origin/newbranch
	560	;;
	561	esac
	562	)
	563	'
	564	}
	565
	566	test_configured_prune unset unset "" kept
	567	test_configured_prune unset unset "--no-prune" kept
	568	test_configured_prune unset unset "--prune" pruned
	569
	570	test_configured_prune false unset "" kept
	571	test_configured_prune false unset "--no-prune" kept
	572	test_configured_prune false unset "--prune" pruned
	573
	574	test_configured_prune true unset "" pruned
	575	test_configured_prune true unset "--prune" pruned
	576	test_configured_prune true unset "--no-prune" kept
	577
	578	test_configured_prune unset false "" kept
	579	test_configured_prune unset false "--no-prune" kept
	580	test_configured_prune unset false "--prune" pruned
	581
	582	test_configured_prune false false "" kept
	583	test_configured_prune false false "--no-prune" kept
584	test_configured_prune false false "--prune" pruned
585
586	test_configured_prune true false "" kept
587	test_configured_prune true false "--prune" pruned
588	test_configured_prune true false "--no-prune" kept
589
590	test_configured_prune unset true "" pruned
591	test_configured_prune unset true "--no-prune" kept
592	test_configured_prune unset true "--prune" pruned
593
594	test_configured_prune false true "" pruned
595	test_configured_prune false true "--no-prune" kept
596	test_configured_prune false true "--prune" pruned
597
598	test_configured_prune true true "" pruned
599	test_configured_prune true true "--prune" pruned
600	test_configured_prune true true "--no-prune" kept
601
efe4be12 TR	602	test_expect_success 'all boundary commits are excluded' '
	603	test_commit base &&
	604	test_commit oneside &&
	605	git checkout HEAD^ &&
	606	test_commit otherside &&
	607	git checkout master &&
	608	test_tick &&
	609	git merge otherside &&
	610	ad=$(git log --no-walk --format=%ad HEAD) &&
	611	git bundle create twoside-boundary.bdl master --since="$ad" &&
	612	convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
	613	pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
	614	test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
95c96d48 JP	615	'
95c96d48 JP	616
7be1d62c	617	test_done