"remote-tracking" branch makes it explicit that the branch is "tracking a remote", as opposed to "remote, and tracking something". See discussion in e.g. http://mid.gmane.org/8835ADF9-45E5-4A26-9F7F-A72ECC065BB2@gmail.com for more details. This patch is a straightforward application of perl -pi -e 's/remote tracking branch/remote-tracking branch/' except in the RelNotes directory. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			31 lines
		
	
	
		
			555 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			31 lines
		
	
	
		
			555 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='fetch follows remote-tracking branches correctly'
 | 
						|
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
test_expect_success setup '
 | 
						|
	>file &&
 | 
						|
	git add . &&
 | 
						|
	test_tick &&
 | 
						|
	git commit -m Initial &&
 | 
						|
	git branch b-0 &&
 | 
						|
	git branch b1 &&
 | 
						|
	git branch b/one &&
 | 
						|
	test_create_repo other &&
 | 
						|
	(
 | 
						|
		cd other &&
 | 
						|
		git config remote.origin.url .. &&
 | 
						|
		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success fetch '
 | 
						|
	(
 | 
						|
		cd other && git fetch origin &&
 | 
						|
		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
 | 
						|
	)
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |