Carefully excluding t5526, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t55[23]*. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -e 's/naster/nain/g' -- \ t55[23]*.sh && git checkout HEAD -- t5526\*) Note that t5533 contains a variation of the name `master` (`naster`) that we rename here, too. This commit allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for that range of tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			49 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='detect some push errors early (before contacting remote)'
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
test_expect_success 'setup commits' '
 | 
						|
	test_commit one
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'setup remote' '
 | 
						|
	git init --bare remote.git &&
 | 
						|
	git remote add origin remote.git
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'setup fake receive-pack' '
 | 
						|
	FAKE_RP_ROOT=$(pwd) &&
 | 
						|
	export FAKE_RP_ROOT &&
 | 
						|
	write_script fake-rp <<-\EOF &&
 | 
						|
	echo yes >"$FAKE_RP_ROOT"/rp-ran
 | 
						|
	exit 1
 | 
						|
	EOF
 | 
						|
	git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'detect missing branches early' '
 | 
						|
	echo no >rp-ran &&
 | 
						|
	echo no >expect &&
 | 
						|
	test_must_fail git push origin missing &&
 | 
						|
	test_cmp expect rp-ran
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'detect missing sha1 expressions early' '
 | 
						|
	echo no >rp-ran &&
 | 
						|
	echo no >expect &&
 | 
						|
	test_must_fail git push origin main~2:main &&
 | 
						|
	test_cmp expect rp-ran
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'detect ambiguous refs early' '
 | 
						|
	git branch foo &&
 | 
						|
	git tag foo &&
 | 
						|
	echo no >rp-ran &&
 | 
						|
	echo no >expect &&
 | 
						|
	test_must_fail git push origin foo &&
 | 
						|
	test_cmp expect rp-ran
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |