t5505-remote.sh 12.9 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12
#!/bin/sh

test_description='git remote porcelain-ish'

. ./test-lib.sh

setup_repository () {
	mkdir "$1" && (
	cd "$1" &&
	git init &&
	>file &&
	git add file &&
13
	test_tick &&
14 15 16 17
	git commit -m "Initial" &&
	git checkout -b side &&
	>elif &&
	git add elif &&
18
	test_tick &&
19 20 21 22 23 24 25 26
	git commit -m "Second" &&
	git checkout master
	)
}

tokens_match () {
	echo "$1" | tr ' ' '\012' | sort | sed -e '/^$/d' >expect &&
	echo "$2" | tr ' ' '\012' | sort | sed -e '/^$/d' >actual &&
27
	test_cmp expect actual
28 29 30
}

check_remote_track () {
31
	actual=$(git remote show "$1" | sed -ne 's|^    \(.*\) tracked$|\1|p')
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
	shift &&
	tokens_match "$*" "$actual"
}

check_tracking_branch () {
	f="" &&
	r=$(git for-each-ref "--format=%(refname)" |
		sed -ne "s|^refs/remotes/$1/||p") &&
	shift &&
	tokens_match "$*" "$r"
}

test_expect_success setup '

	setup_repository one &&
	setup_repository two &&
	(
		cd two && git branch another
	) &&
	git clone one test

'

test_expect_success 'remote information for the origin' '
(
	cd test &&
	tokens_match origin "$(git remote)" &&
	check_remote_track origin master side &&
	check_tracking_branch origin HEAD master side
)
'

test_expect_success 'add another remote' '
(
	cd test &&
	git remote add -f second ../two &&
	tokens_match "origin second" "$(git remote)" &&
	check_remote_track origin master side &&
	check_remote_track second master side another &&
	check_tracking_branch second master side another &&
	git for-each-ref "--format=%(refname)" refs/remotes |
	sed -e "/^refs\/remotes\/origin\//d" \
	    -e "/^refs\/remotes\/second\//d" >actual &&
	>expect &&
76
	test_cmp expect actual
77 78 79
)
'

80 81 82 83 84 85 86 87 88 89
test_expect_success 'remote forces tracking branches' '
(
	cd test &&
	case `git config remote.second.fetch` in
	+*) true ;;
	 *) false ;;
	esac
)
'

90 91 92
test_expect_success 'remove remote' '
(
	cd test &&
93
	git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
94 95 96 97 98 99 100 101 102 103 104 105
	git remote rm second
)
'

test_expect_success 'remove remote' '
(
	cd test &&
	tokens_match origin "$(git remote)" &&
	check_remote_track origin master side &&
	git for-each-ref "--format=%(refname)" refs/remotes |
	sed -e "/^refs\/remotes\/origin\//d" >actual &&
	>expect &&
106
	test_cmp expect actual
107 108 109
)
'

110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
test_expect_success 'remove remote protects non-remote branches' '
(
	cd test &&
	(cat >expect1 <<EOF
Note: A non-remote branch was not removed; to delete it, use:
  git branch -d master
EOF
    cat >expect2 <<EOF
Note: Non-remote branches were not removed; to delete them, use:
  git branch -d foobranch
  git branch -d master
EOF
) &&
	git tag footag
	git config --add remote.oops.fetch "+refs/*:refs/*" &&
	git remote rm oops 2>actual1 &&
	git branch foobranch &&
	git config --add remote.oops.fetch "+refs/*:refs/*" &&
	git remote rm oops 2>actual2 &&
	git branch -d foobranch &&
	git tag -d footag &&
	test_cmp expect1 actual1 &&
	test_cmp expect2 actual2
)
'

136 137
cat > test/expect << EOF
* remote origin
138 139
  Fetch URL: $(pwd)/one
  Push  URL: $(pwd)/one
140
  HEAD branch: master
141 142 143 144
  Remote branches:
    master new (next fetch will store in remotes/origin)
    side   tracked
  Local branches configured for 'git pull':
145
    ahead    merges with remote master
146 147 148 149 150
    master   merges with remote master
    octopus  merges with remote topic-a
                and with remote topic-b
                and with remote topic-c
    rebase  rebases onto remote master
151 152 153
  Local refs configured for 'git push':
    master pushes to master   (local out of date)
    master pushes to upstream (create)
154
* remote two
155 156
  Fetch URL: ../two
  Push  URL: ../three
157 158 159
  HEAD branch (remote HEAD is ambiguous, may be one of the following):
    another
    master
160
  Local refs configured for 'git push':
161
    ahead  forces to master  (fast-forwardable)
162
    master pushes to another (up to date)
163 164 165 166
EOF

test_expect_success 'show' '
	(cd test &&
167
	 git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
168
	 git fetch &&
169 170 171 172 173
	 git checkout -b ahead origin/master &&
	 echo 1 >> file &&
	 test_tick &&
	 git commit -m update file &&
	 git checkout master &&
174 175
	 git branch --track octopus origin/master &&
	 git branch --track rebase origin/master &&
176
	 git branch -d -r origin/master &&
177
	 git config --add remote.two.url ../two &&
178
	 git config --add remote.two.pushurl ../three &&
179 180
	 git config branch.rebase.rebase true &&
	 git config branch.octopus.merge "topic-a topic-b topic-c" &&
181 182
	 (cd ../one &&
	  echo 1 > file &&
183
	  test_tick &&
184
	  git commit -m update file) &&
185 186
	 git config --add remote.origin.push : &&
	 git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
187
	 git config --add remote.origin.push +refs/tags/lastbackup &&
188 189
	 git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
	 git config --add remote.two.push refs/heads/master:refs/heads/another &&
190
	 git remote show origin two > output &&
191
	 git branch -d rebase octopus &&
192
	 test_cmp expect output)
193 194
'

O
Olivier Marin 已提交
195 196
cat > test/expect << EOF
* remote origin
197 198
  Fetch URL: $(pwd)/one
  Push  URL: $(pwd)/one
199
  HEAD branch: (not queried)
200
  Remote branches: (status not queried)
201 202
    master
    side
203 204
  Local branches configured for 'git pull':
    ahead  merges with remote master
205
    master merges with remote master
206 207 208 209
  Local refs configured for 'git push' (status not queried):
    (matching)           pushes to (matching)
    refs/heads/master    pushes to refs/heads/upstream
    refs/tags/lastbackup forces to refs/tags/lastbackup
O
Olivier Marin 已提交
210 211 212 213 214 215 216 217 218 219
EOF

test_expect_success 'show -n' '
	(mv one one.unreachable &&
	 cd test &&
	 git remote show -n origin > output &&
	 mv ../one.unreachable ../one &&
	 test_cmp expect output)
'

220 221 222 223 224 225 226
test_expect_success 'prune' '
	(cd one &&
	 git branch -m side side2) &&
	(cd test &&
	 git fetch origin &&
	 git remote prune origin &&
	 git rev-parse refs/remotes/origin/side2 &&
227
	 test_must_fail git rev-parse refs/remotes/origin/side)
228 229
'

230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269
test_expect_success 'set-head --delete' '
	(cd test &&
	 git symbolic-ref refs/remotes/origin/HEAD &&
	 git remote set-head --delete origin &&
	 test_must_fail git symbolic-ref refs/remotes/origin/HEAD)
'

test_expect_success 'set-head --auto' '
	(cd test &&
	 git remote set-head --auto origin &&
	 echo refs/remotes/origin/master >expect &&
	 git symbolic-ref refs/remotes/origin/HEAD >output &&
	 test_cmp expect output
	)
'

cat >test/expect <<EOF
error: Multiple remote HEAD branches. Please choose one explicitly with:
  git remote set-head two another
  git remote set-head two master
EOF

test_expect_success 'set-head --auto fails w/multiple HEADs' '
	(cd test &&
	 test_must_fail git remote set-head --auto two >output 2>&1 &&
	test_cmp expect output)
'

cat >test/expect <<EOF
refs/remotes/origin/side2
EOF

test_expect_success 'set-head explicit' '
	(cd test &&
	 git remote set-head origin side2 &&
	 git symbolic-ref refs/remotes/origin/HEAD >output &&
	 git remote set-head origin master &&
	 test_cmp expect output)
'

270 271
cat > test/expect << EOF
Pruning origin
272
URL: $(pwd)/one
273 274 275 276 277 278 279 280 281
 * [would prune] origin/side2
EOF

test_expect_success 'prune --dry-run' '
	(cd one &&
	 git branch -m side2 side) &&
	(cd test &&
	 git remote prune --dry-run origin > output &&
	 git rev-parse refs/remotes/origin/side2 &&
282
	 test_must_fail git rev-parse refs/remotes/origin/side &&
283 284 285 286 287
	(cd ../one &&
	 git branch -m side side2) &&
	 test_cmp expect output)
'

288 289 290
test_expect_success 'add --mirror && prune' '
	(mkdir mirror &&
	 cd mirror &&
291
	 git init --bare &&
292 293 294 295 296
	 git remote add --mirror -f origin ../one) &&
	(cd one &&
	 git branch -m side2 side) &&
	(cd mirror &&
	 git rev-parse --verify refs/heads/side2 &&
297
	 test_must_fail git rev-parse --verify refs/heads/side &&
298 299
	 git fetch origin &&
	 git remote prune origin &&
300
	 test_must_fail git rev-parse --verify refs/heads/side2 &&
301 302 303
	 git rev-parse --verify refs/heads/side)
'

304 305 306 307 308 309 310 311 312 313 314
test_expect_success 'add alt && prune' '
	(mkdir alttst &&
	 cd alttst &&
	 git init &&
	 git remote add -f origin ../one &&
	 git config remote.alt.url ../one &&
	 git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
	(cd one &&
	 git branch -m side side2) &&
	(cd alttst &&
	 git rev-parse --verify refs/remotes/origin/side &&
315
	 test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
316 317
	 git fetch alt &&
	 git remote prune alt &&
318
	 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
319 320 321
	 git rev-parse --verify refs/remotes/origin/side2)
'

322 323 324 325 326 327 328 329 330 331 332 333 334 335 336
cat > one/expect << EOF
  apis/master
  apis/side
  drosophila/another
  drosophila/master
  drosophila/side
EOF

test_expect_success 'update' '

	(cd one &&
	 git remote add drosophila ../two &&
	 git remote add apis ../mirror &&
	 git remote update &&
	 git branch -r > output &&
337
	 test_cmp expect output)
338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363

'

cat > one/expect << EOF
  drosophila/another
  drosophila/master
  drosophila/side
  manduca/master
  manduca/side
  megaloprepus/master
  megaloprepus/side
EOF

test_expect_success 'update with arguments' '

	(cd one &&
	 for b in $(git branch -r)
	 do
		git branch -r -d $b || break
	 done &&
	 git remote add manduca ../mirror &&
	 git remote add megaloprepus ../mirror &&
	 git config remotes.phobaeticus "drosophila megaloprepus" &&
	 git config remotes.titanus manduca &&
	 git remote update phobaeticus titanus &&
	 git branch -r > output &&
364
	 test_cmp expect output)
365 366 367

'

368 369 370 371 372 373 374 375 376 377 378
test_expect_success 'update --prune' '

	(cd one &&
	 git branch -m side2 side3) &&
	(cd test &&
	 git remote update --prune &&
	 (cd ../one && git branch -m side3 side2)
	 git rev-parse refs/remotes/origin/side3 &&
	 test_must_fail git rev-parse refs/remotes/origin/side2)
'

379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397
cat > one/expect << EOF
  apis/master
  apis/side
  manduca/master
  manduca/side
  megaloprepus/master
  megaloprepus/side
EOF

test_expect_success 'update default' '

	(cd one &&
	 for b in $(git branch -r)
	 do
		git branch -r -d $b || break
	 done &&
	 git config remote.drosophila.skipDefaultUpdate true &&
	 git remote update default &&
	 git branch -r > output &&
398
	 test_cmp expect output)
399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417

'

cat > one/expect << EOF
  drosophila/another
  drosophila/master
  drosophila/side
EOF

test_expect_success 'update default (overridden, with funny whitespace)' '

	(cd one &&
	 for b in $(git branch -r)
	 do
		git branch -r -d $b || break
	 done &&
	 git config remotes.default "$(printf "\t drosophila  \n")" &&
	 git remote update default &&
	 git branch -r > output &&
418
	 test_cmp expect output)
419 420 421

'

422 423 424 425 426 427 428 429 430 431 432 433 434 435
test_expect_success 'update (with remotes.default defined)' '

	(cd one &&
	 for b in $(git branch -r)
	 do
		git branch -r -d $b || break
	 done &&
	 git config remotes.default "drosophila" &&
	 git remote update &&
	 git branch -r > output &&
	 test_cmp expect output)

'

436 437 438 439 440
test_expect_success '"remote show" does not show symbolic refs' '

	git clone one three &&
	(cd three &&
	 git remote show origin > output &&
441
	 ! grep "^ *HEAD$" < output &&
442 443 444 445
	 ! grep -i stale < output)

'

446 447
test_expect_success 'reject adding remote with an invalid name' '

448
	test_must_fail git remote add some:url desired-name
449 450 451

'

M
Miklos Vajna 已提交
452 453 454 455 456 457 458 459 460 461 462 463 464 465 466
# The first three test if the tracking branches are properly renamed,
# the last two ones check if the config is updated.

test_expect_success 'rename a remote' '

	git clone one four &&
	(cd four &&
	 git remote rename origin upstream &&
	 rmdir .git/refs/remotes/origin &&
	 test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
	 test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
	 test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
	 test "$(git config branch.master.remote)" = "upstream")

'
467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499

cat > remotes_origin << EOF
URL: $(pwd)/one
Push: refs/heads/master:refs/heads/upstream
Pull: refs/heads/master:refs/heads/origin
EOF

test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
	git clone one five &&
	origin_url=$(pwd)/one &&
	(cd five &&
	 git remote rm origin &&
	 mkdir -p .git/remotes &&
	 cat ../remotes_origin > .git/remotes/origin &&
	 git remote rename origin origin &&
	 ! test -f .git/remotes/origin &&
	 test "$(git config remote.origin.url)" = "$origin_url" &&
	 test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
	 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
'

test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
	git clone one six &&
	origin_url=$(pwd)/one &&
	(cd six &&
	 git remote rm origin &&
	 echo "$origin_url" > .git/branches/origin &&
	 git remote rename origin origin &&
	 ! test -f .git/branches/origin &&
	 test "$(git config remote.origin.url)" = "$origin_url" &&
	 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
'

500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518
test_expect_success 'remote prune to cause a dangling symref' '
	git clone one seven &&
	(
		cd one &&
		git checkout side2 &&
		git branch -D master
	) &&
	(
		cd seven &&
		git remote prune origin
	) 2>err &&
	grep "has become dangling" err &&

	: And the dangling symref will not cause other annoying errors
	(
		cd seven &&
		git branch -a
	) 2>err &&
	! grep "points nowhere" err
519 520 521 522 523
	(
		cd seven &&
		test_must_fail git branch nomore origin
	) 2>err &&
	grep "dangling symref" err
524 525
'

526 527 528 529 530 531 532 533 534 535
test_expect_success 'show empty remote' '

	test_create_repo empty &&
	git clone empty empty-clone &&
	(
		cd empty-clone &&
		git remote show origin
	)
'

536
test_done
537