From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 19:04:07 +0000 (-0700)
Subject: Merge branch 'ms/remote-tracking-branches-in-doc'
X-Git-Tag: v1.8.4-rc0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=778e4b890390e90e19b7f835f3b0ffe92e8d5345;p=thirdparty%2Fgit.git

Merge branch 'ms/remote-tracking-branches-in-doc'

* ms/remote-tracking-branches-in-doc:
  Change "remote tracking" to "remote-tracking"
---

778e4b890390e90e19b7f835f3b0ffe92e8d5345
diff --cc t/t5505-remote.sh
index ee5d65d52f,8d0f3e3078..8f6e3922dc
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@@ -61,25 -62,25 +61,25 @@@ test_expect_success C_LOCALE_OUTPUT 're
  '
  
  test_expect_success 'add another remote' '
 -(
 -	cd test &&
 -	git remote add -f second ../two &&
 -	tokens_match "origin second" "$(git remote)" &&
 -	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 &&
 -	test_cmp expect actual
 -)
 +	(
 +		cd test &&
 +		git remote add -f second ../two &&
 +		tokens_match "origin second" "$(git remote)" &&
 +		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 &&
 +		test_cmp expect actual
 +	)
  '
  
- test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+ test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
 -(
 -	cd test &&
 -	check_remote_track origin master side &&
 -	check_remote_track second master side another
 -)
 +	(
 +		cd test &&
 +		check_remote_track origin master side &&
 +		check_remote_track second master side another
 +	)
  '
  
  test_expect_success 'remote forces tracking branches' '