git-fetch: follow lightweit tags as well.
This side-ports commit fd19f620 from Cogito, in which I fixed exactly the same bug. Somehow nobody noticed this for a long time in git. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
		@ -432,10 +432,11 @@ case "$no_tags$tags" in
 | 
				
			|||||||
		# using local tracking branch.
 | 
							# using local tracking branch.
 | 
				
			||||||
		taglist=$(IFS=" " &&
 | 
							taglist=$(IFS=" " &&
 | 
				
			||||||
		git-ls-remote $upload_pack --tags "$remote" |
 | 
							git-ls-remote $upload_pack --tags "$remote" |
 | 
				
			||||||
		sed -ne 's|^\([0-9a-f]*\)[ 	]\(refs/tags/.*\)^{}$|\1 \2|p' |
 | 
							sed -n	-e 's|^\('"$_x40"'\)	\(refs/tags/.*\)^{}$|\1 \2|p' \
 | 
				
			||||||
 | 
								-e 's|^\('"$_x40"'\)	\(refs/tags/.*\)$|\1 \2|p' |
 | 
				
			||||||
		while read sha1 name
 | 
							while read sha1 name
 | 
				
			||||||
		do
 | 
							do
 | 
				
			||||||
			git-show-ref --verify --quiet -- $name && continue
 | 
								git-show-ref --verify --quiet -- "$name" && continue
 | 
				
			||||||
			git-check-ref-format "$name" || {
 | 
								git-check-ref-format "$name" || {
 | 
				
			||||||
				echo >&2 "warning: tag ${name} ignored"
 | 
									echo >&2 "warning: tag ${name} ignored"
 | 
				
			||||||
				continue
 | 
									continue
 | 
				
			||||||
 | 
				
			|||||||
@ -66,4 +66,20 @@ test_expect_success "fetch test for-merge" '
 | 
				
			|||||||
	cut -f -2 .git/FETCH_HEAD >actual &&
 | 
						cut -f -2 .git/FETCH_HEAD >actual &&
 | 
				
			||||||
	diff expected actual'
 | 
						diff expected actual'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					test_expect_success 'fetch following tags' '
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						cd "$D" &&
 | 
				
			||||||
 | 
						git tag -a -m 'annotated' anno HEAD &&
 | 
				
			||||||
 | 
						git tag light HEAD &&
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						mkdir four &&
 | 
				
			||||||
 | 
						cd four &&
 | 
				
			||||||
 | 
						git init-db &&
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						git fetch .. :track &&
 | 
				
			||||||
 | 
						git show-ref --verify refs/tags/anno &&
 | 
				
			||||||
 | 
						git show-ref --verify refs/tags/light
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
test_done
 | 
					test_done
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user