t5510-fetch.sh 7.3 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
#!/bin/sh
# Copyright (c) 2006, Junio C Hamano.

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

'

. ./test-lib.sh

D=`pwd`

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

17 18 19 20 21 22 23 24 25 26 27 28 29
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" &&
	cd .. &&
	git clone . two &&
	cd two &&
30 31 32
	git config branch.master.remote one &&
	git config remote.one.url ../one/.git/ &&
	git config remote.one.fetch refs/heads/master:refs/heads/one &&
33 34 35
	cd .. &&
	git clone . three &&
	cd three &&
36 37
	git config branch.master.remote two &&
	git config branch.master.merge refs/heads/one &&
38
	mkdir -p .git/remotes &&
39 40 41 42
	{
		echo "URL: ../two/.git/"
		echo "Pull: refs/heads/master:refs/heads/two"
		echo "Pull: refs/heads/one:refs/heads/one"
43 44
	} >.git/remotes/two &&
	cd .. &&
45 46
	git clone . bundle &&
	git clone . seven
47 48 49 50 51 52 53 54 55 56 57 58 59 60
'

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"
'

61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
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 "$master_in_two	not-for-merge"
		echo "$one_in_two	"
	} >expected &&
	cut -f -2 .git/FETCH_HEAD >actual &&
	diff expected actual'

76 77 78 79 80 81 82 83 84 85 86 87
test_expect_success 'fetch tags when there is no tags' '

    cd "$D" &&

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

    git fetch -t ..

'

88 89 90 91 92 93 94 95
test_expect_success 'fetch following tags' '

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

	mkdir four &&
	cd four &&
96
	git init &&
97 98 99 100 101 102 103

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

'

J
Junio C Hamano 已提交
104
test_expect_success 'fetch must not resolve short tag name' '
105 106 107 108 109 110 111

	cd "$D" &&

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

112
	test_must_fail git fetch .. anno:five
113 114 115

'

J
Junio C Hamano 已提交
116
test_expect_success 'fetch must not resolve short remote name' '
117 118

	cd "$D" &&
119
	git update-ref refs/remotes/six/HEAD HEAD
120 121 122 123 124

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

125
	test_must_fail git fetch .. six:six
126 127 128

'

129 130 131 132 133 134 135
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
'

136 137 138 139 140 141 142
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 "^$"
'

143 144 145 146 147
test_expect_success 'create bundle 2' '
	cd "$D" &&
	git bundle create bundle2 master~2..master
'

J
Junio C Hamano 已提交
148
test_expect_success 'unbundle 1' '
149 150
	cd "$D/bundle" &&
	git checkout -b some-branch &&
151
	test_must_fail git fetch "$D/bundle1" master:master
152 153
'

154

155 156 157 158 159 160 161 162 163 164
test_expect_success 'bundle 1 has only 3 files ' '
	cd "$D" &&
	(
		while read x && test -n "$x"
		do
			:;
		done
		cat
	) <bundle1 >bundle.pack &&
	git index-pack bundle.pack &&
165
	test_bundle_object_count bundle.pack 3
166 167
'

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

174 175 176 177 178 179
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 &&
S
Shawn O. Pearce 已提交
180 181 182 183 184 185 186
	(
		while read x && test -n "$x"
		do
			:;
		done
		cat
	) <bundle3 >bundle.pack &&
187
	git index-pack bundle.pack &&
188
	test_bundle_object_count bundle.pack 3
189 190
'

191 192 193 194 195 196 197 198
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

'

199 200
! rsync --help > /dev/null 2> /dev/null &&
say 'Skipping rsync tests because rsync was not found' || {
201 202 203
test_expect_success 'fetch via rsync' '
	git pack-refs &&
	mkdir rsynced &&
204 205 206 207 208 209
	(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)
210 211 212
'

test_expect_success 'push via rsync' '
213 214
	mkdir rsynced2 &&
	(cd rsynced2 &&
215
	 git init) &&
216 217 218 219 220 221
	(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)
222 223 224 225 226 227
'

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

235 236 237 238 239 240 241 242
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
'

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

250 251 252 253 254 255 256 257 258
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 &&
259
	test_cmp expect actual
260 261 262

'

263 264 265 266 267 268 269 270 271 272
test_expect_success 'explicit fetch should not update tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		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" &&
273
		test_must_fail git rev-parse --verify refs/remotes/origin/side
274 275 276 277 278 279 280 281 282 283 284 285 286
	)
'

test_expect_success 'explicit pull should not update tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		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" &&
287
		test_must_fail git rev-parse --verify refs/remotes/origin/side
288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304
	)
'

test_expect_success 'configured fetch updates tracking' '

	cd "$D" &&
	git branch -f side &&
	(
		cd three &&
		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
	)
'

305 306 307 308 309 310 311
test_expect_success 'pushing nonexistent branch by mistake should not segv' '

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

'

312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331
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
	)
'

332 333 334 335 336 337 338 339 340 341 342 343
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

'

344
test_done