Commitafe5d3d5introduced a safety valve to symbolic-ref to disallow installing an invalid HEAD. It was accompanied byb229d18a, which changed validate_headref to require that HEAD contain a pointer to refs/heads/ instead of just refs/. Therefore, the safety valve also checked for refs/heads/. As it turns out, topgit is using refs/top-bases/ in HEAD, leading us to re-loosen (at least temporarily) the validate_headref check made inb229d18a. This patch does the corresponding loosening for the symbolic-ref safety valve, so that the two are in agreement once more. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			37 lines
		
	
	
		
			927 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
		
			927 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='basic symbolic-ref tests'
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
# If the tests munging HEAD fail, they can break detection of
 | 
						|
# the git repo, meaning that further tests will operate on
 | 
						|
# the surrounding git repo instead of the trash directory.
 | 
						|
reset_to_sane() {
 | 
						|
	echo ref: refs/heads/foo >.git/HEAD
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'symbolic-ref writes HEAD' '
 | 
						|
	git symbolic-ref HEAD refs/heads/foo &&
 | 
						|
	echo ref: refs/heads/foo >expect &&
 | 
						|
	test_cmp expect .git/HEAD
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'symbolic-ref reads HEAD' '
 | 
						|
	echo refs/heads/foo >expect &&
 | 
						|
	git symbolic-ref HEAD >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'symbolic-ref refuses non-ref for HEAD' '
 | 
						|
	test_must_fail git symbolic-ref HEAD foo
 | 
						|
'
 | 
						|
reset_to_sane
 | 
						|
 | 
						|
test_expect_success 'symbolic-ref refuses bare sha1' '
 | 
						|
	echo content >file && git add file && git commit -m one
 | 
						|
	test_must_fail git symbolic-ref HEAD `git rev-parse HEAD`
 | 
						|
'
 | 
						|
reset_to_sane
 | 
						|
 | 
						|
test_done
 |