[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 fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&

	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 fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&

	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 does not delete the remote-tracking branches' '
	cd "$D" &&
	git clone . prune-tags &&
	cd prune-tags &&
	git fetch origin refs/heads/master:refs/tags/sometag &&

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

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 fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&

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

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