From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Aug 2011 21:45:02 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.7-rc0~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=259bcfb6b987021be592ed640253215bcbbf6d7d;p=git.git

Merge branch 'maint'

* maint:
  connect: correctly number ipv6 network adapter
---

259bcfb6b987021be592ed640253215bcbbf6d7d
diff --cc connect.c
index 844107e29,b3585aba2..d2ce57f85
--- a/connect.c
+++ b/connect.c
@@@ -217,15 -216,21 +217,15 @@@ static int git_tcp_connect_sock(char *h
  	if (flags & CONNECT_VERBOSE)
  		fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
  
- 	for (ai0 = ai; ai; ai = ai->ai_next) {
+ 	for (ai0 = ai; ai; ai = ai->ai_next, cnt++) {
  		sockfd = socket(ai->ai_family,
  				ai->ai_socktype, ai->ai_protocol);
 -		if (sockfd < 0) {
 -			saved_errno = errno;
 -			continue;
 -		}
 -		if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
 -			saved_errno = errno;
 -			fprintf(stderr, "%s[%d: %s]: errno=%s\n",
 -				host,
 -				cnt,
 -				ai_name(ai),
 -				strerror(saved_errno));
 -			close(sockfd);
 +		if ((sockfd < 0) ||
 +		    (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0)) {
 +			strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
 +				    host, cnt, ai_name(ai), strerror(errno));
 +			if (0 <= sockfd)
 +				close(sockfd);
  			sockfd = -1;
  			continue;
  		}