[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 handles overlapping refspecs' '
	cd "$D" &&
	git update-ref refs/pull/42/head master &&
	git clone . prune-overlapping &&
	cd prune-overlapping &&
	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&

	git fetch --prune origin &&
	git rev-parse origin/master &&
	git rev-parse origin/pr/42 &&

	git config --unset-all remote.origin.fetch
	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&

	git fetch --prune origin &&
	git rev-parse origin/master &&
	git rev-parse origin/pr/42
'

test_expect_success 'fetch --prune --tags prunes branches but not tags' '
	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 &&
	git rev-parse sometag
'

test_expect_success 'fetch --prune --tags with branch does not prune other things' '
	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 &&
	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 &&
	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:../.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:../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: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_expect_success 'fetch --prune prints the remotes url' '
	git branch goodbye &&
	git clone . only-prunes &&
	git branch -D goodbye &&
	(
		cd only-prunes &&
		git fetch --prune origin 2>&1 | head -n1 >../actual
	) &&
	echo "From ${D}/." >expect &&
	test_cmp expect actual
'

test_expect_success 'branchname D/F conflict resolved by --prune' '
	git branch dir/file &&
	git clone . prune-df-conflict &&
	git branch -D dir/file &&
	git branch dir &&
	(
		cd prune-df-conflict &&
		git fetch --prune &&
		git rev-parse origin/dir >../actual
	) &&
	git rev-parse dir >expect &&
	test_cmp expect actual
'

test_expect_success 'fetching a one-level ref works' '
	test_commit extra &&
	git reset --hard HEAD^ &&
	git update-ref refs/foo extra &&
	git init one-level &&
	(
		cd one-level &&
		git fetch .. HEAD refs/foo
	)
'

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
e6f63712	116	test_expect_success 'fetch --prune handles overlapping refspecs' '
f377e7a3 CMN	117	cd "$D" &&
	118	git update-ref refs/pull/42/head master &&
	119	git clone . prune-overlapping &&
	120	cd prune-overlapping &&
	121	git config --add remote.origin.fetch refs/pull//head:refs/remotes/origin/pr/ &&
	122
	123	git fetch --prune origin &&
	124	git rev-parse origin/master &&
	125	git rev-parse origin/pr/42 &&
	126
	127	git config --unset-all remote.origin.fetch
	128	git config remote.origin.fetch refs/pull//head:refs/remotes/origin/pr/ &&
	129	git config --add remote.origin.fetch refs/heads/:refs/remotes/origin/ &&
	130
	131	git fetch --prune origin &&
	132	git rev-parse origin/master &&
	133	git rev-parse origin/pr/42
	134	'
	135
0838bf47	136	test_expect_success 'fetch --prune --tags prunes branches but not tags' '
43a8a04a CMN	137	cd "$D" &&
	138	git clone . prune-tags &&
	139	cd prune-tags &&
d0d06e89	140	git tag sometag master &&
68a304d5 MH	141	# Create what looks like a remote-tracking branch from an earlier
	142	# fetch that has since been deleted from the remote:
	143	git update-ref refs/remotes/origin/fake-remote master &&
43a8a04a CMN	144
	145	git fetch --prune --tags origin &&
	146	git rev-parse origin/master &&
c5a84e92	147	test_must_fail git rev-parse origin/fake-remote &&
0838bf47	148	git rev-parse sometag
43a8a04a CMN	149	'
43a8a04a CMN	150
0838bf47	151	test_expect_success 'fetch --prune --tags with branch does not prune other things' '
43a8a04a CMN	152	cd "$D" &&
	153	git clone . prune-tags-branch &&
	154	cd prune-tags-branch &&
c5a84e92	155	git tag sometag master &&
d0d06e89	156	git update-ref refs/remotes/origin/extrabranch master &&
43a8a04a CMN	157
43a8a04a CMN	158	git fetch --prune --tags origin master &&
c5a84e92	159	git rev-parse origin/extrabranch &&
0838bf47	160	git rev-parse sometag
c5a84e92 MH	161	'
	162
	163	test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
	164	cd "$D" &&
	165	git clone . prune-tags-refspec &&
	166	cd prune-tags-refspec &&
	167	git tag sometag master &&
	168	git update-ref refs/remotes/origin/foo/otherbranch master &&
	169	git update-ref refs/remotes/origin/extrabranch master &&
	170
	171	git fetch --prune --tags origin refs/heads/foo/:refs/remotes/origin/foo/ &&
	172	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
	173	git rev-parse origin/extrabranch &&
0838bf47	174	git rev-parse sometag
43a8a04a CMN	175	'
43a8a04a CMN	176
f539d0d6 VJ	177	test_expect_success 'fetch tags when there is no tags' '
	178
	179	cd "$D" &&
	180
	181	mkdir notags &&
	182	cd notags &&
	183	git init &&
	184
	185	git fetch -t ..
	186
	187	'
	188
6c96c0f1 JH	189	test_expect_success 'fetch following tags' '
	190
	191	cd "$D" &&
	192	git tag -a -m 'annotated' anno HEAD &&
	193	git tag light HEAD &&
	194
	195	mkdir four &&
	196	cd four &&
5c94f87e	197	git init &&
6c96c0f1 JH	198
	199	git fetch .. :track &&
	200	git show-ref --verify refs/tags/anno &&
	201	git show-ref --verify refs/tags/light
	202
	203	'
	204
0997adaa MB	205	test_expect_success 'fetch uses remote ref names to describe new refs' '
	206	cd "$D" &&
	207	git init descriptive &&
	208	(
	209	cd descriptive &&
	210	git config remote.o.url .. &&
	211	git config remote.o.fetch "refs/heads/:refs/crazyheads/" &&
	212	git config --add remote.o.fetch "refs/others/:refs/heads/" &&
	213	git fetch o
	214	) &&
	215	git tag -a -m "Descriptive tag" descriptive-tag &&
	216	git branch descriptive-branch &&
	217	git checkout descriptive-branch &&
	218	echo "Nuts" >crazy &&
	219	git add crazy &&
	220	git commit -a -m "descriptive commit" &&
	221	git update-ref refs/others/crazy HEAD &&
	222	(
	223	cd descriptive &&
	224	git fetch o 2>actual &&
	225	grep " -> refs/crazyheads/descriptive-branch$" actual \|
	226	test_i18ngrep "new branch" &&
	227	grep " -> descriptive-tag$" actual \|
	228	test_i18ngrep "new tag" &&
	229	grep " -> crazy$" actual \|
	230	test_i18ngrep "new ref"
	231	) &&
	232	git checkout master
	233	'
	234
41ac414e	235	test_expect_success 'fetch must not resolve short tag name' '
605b4978 SP	236
	237	cd "$D" &&
	238
	239	mkdir five &&
	240	cd five &&
	241	git init &&
	242
d492b31c	243	test_must_fail git fetch .. anno:five
605b4978 SP	244
	245	'
	246
dd621df9	247	test_expect_success 'fetch can now resolve short remote name' '
605b4978 SP	248
605b4978 SP	249	cd "$D" &&
a48fcd83	250	git update-ref refs/remotes/six/HEAD HEAD &&
605b4978 SP	251
	252	mkdir six &&
	253	cd six &&
	254	git init &&
	255
dd621df9	256	git fetch .. six:six
605b4978 SP	257	'
605b4978 SP	258
2e0afafe JS	259	test_expect_success 'create bundle 1' '
	260	cd "$D" &&
	261	echo >file updated again by origin &&
	262	git commit -a -m "tip" &&
	263	git bundle create bundle1 master^..master
	264	'
	265
8315588b JS	266	test_expect_success 'header of bundle looks right' '
	267	head -n 1 "$D"/bundle1 \| grep "^#" &&
	268	head -n 2 "$D"/bundle1 \| grep "^-[0-9a-f]\{40\} " &&
	269	head -n 3 "$D"/bundle1 \| grep "^[0-9a-f]\{40\} " &&
	270	head -n 4 "$D"/bundle1 \| grep "^$"
	271	'
	272
2e0afafe JS	273	test_expect_success 'create bundle 2' '
	274	cd "$D" &&
	275	git bundle create bundle2 master~2..master
	276	'
	277
41ac414e	278	test_expect_success 'unbundle 1' '
2e0afafe JS	279	cd "$D/bundle" &&
2e0afafe JS	280	git checkout -b some-branch &&
d492b31c	281	test_must_fail git fetch "$D/bundle1" master:master
2e0afafe JS	282	'
2e0afafe JS	283
2e674a9d	284
8315588b JS	285	test_expect_success 'bundle 1 has only 3 files ' '
8315588b JS	286	cd "$D" &&
61821aaa	287	convert_bundle_to_pack <bundle1 >bundle.pack &&
8315588b	288	git index-pack bundle.pack &&
2e674a9d	289	test_bundle_object_count bundle.pack 3
8315588b JS	290	'
8315588b JS	291
2e0afafe JS	292	test_expect_success 'unbundle 2' '
	293	cd "$D/bundle" &&
	294	git fetch ../bundle2 master:master &&
	295	test "tip" = "$(git log -1 --pretty=oneline master \| cut -b42-)"
	296	'
	297
18449ab0 JS	298	test_expect_success 'bundle does not prerequisite objects' '
	299	cd "$D" &&
	300	touch file2 &&
	301	git add file2 &&
	302	git commit -m add.file2 file2 &&
	303	git bundle create bundle3 -1 HEAD &&
61821aaa	304	convert_bundle_to_pack <bundle3 >bundle.pack &&
18449ab0	305	git index-pack bundle.pack &&
2e674a9d	306	test_bundle_object_count bundle.pack 3
18449ab0 JS	307	'
18449ab0 JS	308
7fa8254f JH	309	test_expect_success 'bundle should be able to create a full history' '
	310
	311	cd "$D" &&
	312	git tag -a -m '1.0' v1.0 master &&
	313	git bundle create bundle4 v1.0
	314
	315	'
	316
7efaeba2 JS	317	! rsync --help > /dev/null 2> /dev/null &&
7efaeba2 JS	318	say 'Skipping rsync tests because rsync was not found' \|\| {
cd547b48 JS	319	test_expect_success 'fetch via rsync' '
	320	git pack-refs &&
	321	mkdir rsynced &&
7efaeba2 JS	322	(cd rsynced &&
7efaeba2 JS	323	git init --bare &&
ab58289e	324	git fetch "rsync:../.git" master:refs/heads/master &&
7efaeba2 JS	325	git gc --prune &&
	326	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	327	git fsck --full)
cd547b48 JS	328	'
	329
	330	test_expect_success 'push via rsync' '
7efaeba2 JS	331	mkdir rsynced2 &&
7efaeba2 JS	332	(cd rsynced2 &&
cd547b48	333	git init) &&
7efaeba2	334	(cd rsynced &&
ab58289e	335	git push "rsync:../rsynced2/.git" master) &&
7efaeba2 JS	336	(cd rsynced2 &&
	337	git gc --prune &&
	338	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	339	git fsck --full)
cd547b48 JS	340	'
	341
	342	test_expect_success 'push via rsync' '
cd547b48 JS	343	mkdir rsynced3 &&
	344	(cd rsynced3 &&
	345	git init) &&
ab58289e	346	git push --all "rsync:rsynced3/.git" &&
7efaeba2 JS	347	(cd rsynced3 &&
	348	test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
	349	git fsck --full)
cd547b48 JS	350	'
	351	}
	352
da0204df JS	353	test_expect_success 'fetch with a non-applying branch.<name>.merge' '
	354	git config branch.master.remote yeti &&
	355	git config branch.master.merge refs/heads/bigfoot &&
	356	git config remote.blub.url one &&
	357	git config remote.blub.fetch "refs/heads/:refs/remotes/one/" &&
	358	git fetch blub
	359	'
	360
042cca38 BC	361	# URL supplied to fetch does not match the url of the configured branch's remote
	362	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
	363	one_head=$(cd one && git rev-parse HEAD) &&
	364	this_head=$(git rev-parse HEAD) &&
6106ce46 BC	365	git update-ref -d FETCH_HEAD &&
6106ce46 BC	366	git fetch one &&
042cca38 BC	367	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	368	test $this_head = "$(git rev-parse --verify HEAD)"
	369	'
	370
	371	# URL supplied to fetch matches the url of the configured branch's remote and
	372	# the merge spec matches the branch the remote HEAD points to
	373	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
	374	one_ref=$(cd one && git symbolic-ref HEAD) &&
	375	git config branch.master.remote blub &&
	376	git config branch.master.merge "$one_ref" &&
	377	git update-ref -d FETCH_HEAD &&
	378	git fetch one &&
	379	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	380	test $this_head = "$(git rev-parse --verify HEAD)"
	381	'
	382
	383	# URL supplied to fetch matches the url of the configured branch's remote, but
	384	# the merge spec does not match the branch the remote HEAD points to
	385	test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
	386	git config branch.master.merge "${one_ref}_not" &&
	387	git update-ref -d FETCH_HEAD &&
	388	git fetch one &&
	389	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
	390	test $this_head = "$(git rev-parse --verify HEAD)"
6106ce46 BC	391	'
6106ce46 BC	392
c2015b3a JS	393	# the strange name is: a\!'b
c2015b3a JS	394	test_expect_success 'quoting of a strangely named repo' '
d492b31c	395	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
c2015b3a JS	396	cat result &&
	397	grep "fatal: '\''a\\\\!'\''b'\''" result
	398	'
	399
c5546e88 JS	400	test_expect_success 'bundle should record HEAD correctly' '
	401
	402	cd "$D" &&
	403	git bundle create bundle5 HEAD master &&
	404	git bundle list-heads bundle5 >actual &&
	405	for h in HEAD refs/heads/master
	406	do
	407	echo "$(git rev-parse --verify $h) $h"
	408	done >expect &&
82ebb0b6	409	test_cmp expect actual
c5546e88 JS	410
	411	'
	412
51f8c814 JK	413	test_expect_success 'mark initial state of origin/master' '
	414	(
	415	cd three &&
	416	git tag base-origin-master refs/remotes/origin/master
	417	)
	418	'
	419
f2690487	420	test_expect_success 'explicit fetch should update tracking' '
c7015961 JH	421
	422	cd "$D" &&
	423	git branch -f side &&
	424	(
	425	cd three &&
51f8c814	426	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	427	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	428	git fetch origin master &&
	429	n=$(git rev-parse --verify refs/remotes/origin/master) &&
f2690487	430	test "$o" != "$n" &&
d492b31c	431	test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961 JH	432	)
	433	'
	434
f2690487	435	test_expect_success 'explicit pull should update tracking' '
c7015961 JH	436
	437	cd "$D" &&
	438	git branch -f side &&
	439	(
	440	cd three &&
51f8c814	441	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	442	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	443	git pull origin master &&
	444	n=$(git rev-parse --verify refs/remotes/origin/master) &&
f2690487	445	test "$o" != "$n" &&
d492b31c	446	test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961 JH	447	)
	448	'
	449
	450	test_expect_success 'configured fetch updates tracking' '
	451
	452	cd "$D" &&
	453	git branch -f side &&
	454	(
	455	cd three &&
51f8c814	456	git update-ref refs/remotes/origin/master base-origin-master &&
c7015961 JH	457	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	458	git fetch origin &&
	459	n=$(git rev-parse --verify refs/remotes/origin/master) &&
	460	test "$o" != "$n" &&
	461	git rev-parse --verify refs/remotes/origin/side
	462	)
	463	'
	464
823c6d56 JK	465	test_expect_success 'non-matching refspecs do not confuse tracking update' '
	466	cd "$D" &&
	467	git update-ref refs/odd/location HEAD &&
	468	(
	469	cd three &&
	470	git update-ref refs/remotes/origin/master base-origin-master &&
	471	git config --add remote.origin.fetch \
	472	refs/odd/location:refs/remotes/origin/odd &&
	473	o=$(git rev-parse --verify refs/remotes/origin/master) &&
	474	git fetch origin master &&
	475	n=$(git rev-parse --verify refs/remotes/origin/master) &&
	476	test "$o" != "$n" &&
	477	test_must_fail git rev-parse --verify refs/remotes/origin/odd
	478	)
	479	'
	480
9a7bbd1d JK	481	test_expect_success 'pushing nonexistent branch by mistake should not segv' '
	482
	483	cd "$D" &&
	484	test_must_fail git push seven no:no
	485
	486	'
	487
49420252 JH	488	test_expect_success 'auto tag following fetches minimum' '
	489
	490	cd "$D" &&
	491	git clone .git follow &&
	492	git checkout HEAD^0 &&
	493	(
	494	for i in 1 2 3 4 5 6 7
	495	do
	496	echo $i >>file &&
	497	git commit -m $i -a &&
	498	git tag -a -m $i excess-$i \|\| exit 1
	499	done
	500	) &&
	501	git checkout master &&
	502	(
	503	cd follow &&
	504	git fetch
	505	)
	506	'
	507
8ee5d731 JS	508	test_expect_success 'refuse to fetch into the current branch' '
	509
	510	test_must_fail git fetch . side:master
	511
	512	'
	513
	514	test_expect_success 'fetch into the current branch with --update-head-ok' '
	515
	516	git fetch --update-head-ok . side:master
	517
	518	'
	519
3fdcdbdf JS	520	test_expect_success 'fetch --dry-run' '
	521
	522	rm -f .git/FETCH_HEAD &&
	523	git fetch --dry-run . &&
	524	! test -f .git/FETCH_HEAD
	525	'
	526
95c96d48	527	test_expect_success "should be able to fetch with duplicate refspecs" '
aa982856 TR	528	mkdir dups &&
	529	(
	530	cd dups &&
	531	git init &&
	532	git config branch.master.remote three &&
	533	git config remote.three.url ../three/.git &&
	534	git config remote.three.fetch +refs/heads/:refs/remotes/origin/ &&
	535	git config --add remote.three.fetch +refs/heads/:refs/remotes/origin/ &&
	536	git fetch three
	537	)
95c96d48 JP	538	'
95c96d48 JP	539
737c5a9c MS	540	# configured prune tests
	541
	542	set_config_tristate () {
	543	# var=$1 val=$2
	544	case "$2" in
	545	unset) test_unconfig "$1" ;;
	546	*) git config "$1" "$2" ;;
	547	esac
	548	}
	549
	550	test_configured_prune () {
	551	fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4
	552
	553	test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
	554	# make sure a newbranch is there in . and also in one
	555	git branch -f newbranch &&
	556	(
	557	cd one &&
	558	test_unconfig fetch.prune &&
	559	test_unconfig remote.origin.prune &&
	560	git fetch &&
	561	git rev-parse --verify refs/remotes/origin/newbranch
	562	)
	563
	564	# now remove it
	565	git branch -d newbranch &&
	566
	567	# then test
	568	(
	569	cd one &&
	570	set_config_tristate fetch.prune $fetch_prune &&
	571	set_config_tristate remote.origin.prune $remote_origin_prune &&
	572
	573	git fetch $cmdline &&
	574	case "$expected" in
	575	pruned)
	576	test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
	577	;;
	578	kept)
	579	git rev-parse --verify refs/remotes/origin/newbranch
	580	;;
	581	esac
	582	)
	583	'
	584	}
	585
	586	test_configured_prune unset unset "" kept
	587	test_configured_prune unset unset "--no-prune" kept
	588	test_configured_prune unset unset "--prune" pruned
	589
	590	test_configured_prune false unset "" kept
	591	test_configured_prune false unset "--no-prune" kept
	592	test_configured_prune false unset "--prune" pruned
	593
	594	test_configured_prune true unset "" pruned
	595	test_configured_prune true unset "--prune" pruned
	596	test_configured_prune true unset "--no-prune" kept
	597
	598	test_configured_prune unset false "" kept
	599	test_configured_prune unset false "--no-prune" kept
	600	test_configured_prune unset false "--prune" pruned
	601
	602	test_configured_prune false false "" kept
	603	test_configured_prune false false "--no-prune" kept
604	test_configured_prune false false "--prune" pruned
605
606	test_configured_prune true false "" kept
607	test_configured_prune true false "--prune" pruned
608	test_configured_prune true false "--no-prune" kept
609
610	test_configured_prune unset true "" pruned
611	test_configured_prune unset true "--no-prune" kept
612	test_configured_prune unset true "--prune" pruned
613
614	test_configured_prune false true "" pruned
615	test_configured_prune false true "--no-prune" kept
616	test_configured_prune false true "--prune" pruned
617
618	test_configured_prune true true "" pruned
619	test_configured_prune true true "--prune" pruned
620	test_configured_prune true true "--no-prune" kept
621
efe4be12 TR	622	test_expect_success 'all boundary commits are excluded' '
	623	test_commit base &&
	624	test_commit oneside &&
	625	git checkout HEAD^ &&
	626	test_commit otherside &&
	627	git checkout master &&
	628	test_tick &&
	629	git merge otherside &&
	630	ad=$(git log --no-walk --format=%ad HEAD) &&
	631	git bundle create twoside-boundary.bdl master --since="$ad" &&
	632	convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
	633	pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
	634	test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
95c96d48 JP	635	'
95c96d48 JP	636
4b3b33a7 TM	637	test_expect_success 'fetch --prune prints the remotes url' '
	638	git branch goodbye &&
	639	git clone . only-prunes &&
	640	git branch -D goodbye &&
	641	(
	642	cd only-prunes &&
	643	git fetch --prune origin 2>&1 \| head -n1 >../actual
	644	) &&
	645	echo "From ${D}/." >expect &&
	646	test_cmp expect actual
	647	'
	648
10a6cc88 TM	649	test_expect_success 'branchname D/F conflict resolved by --prune' '
	650	git branch dir/file &&
	651	git clone . prune-df-conflict &&
	652	git branch -D dir/file &&
	653	git branch dir &&
	654	(
	655	cd prune-df-conflict &&
	656	git fetch --prune &&
	657	git rev-parse origin/dir >../actual
	658	) &&
	659	git rev-parse dir >expect &&
	660	test_cmp expect actual
	661	'
	662
4c224081 JK	663	test_expect_success 'fetching a one-level ref works' '
	664	test_commit extra &&
	665	git reset --hard HEAD^ &&
	666	git update-ref refs/foo extra &&
	667	git init one-level &&
	668	(
	669	cd one-level &&
	670	git fetch .. HEAD refs/foo
	671	)
	672	'
	673
7be1d62c	674	test_done