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: https://git.lorimer.id.au/gitweb.git/diff_plain/259bcfb6b987021be592ed640253215bcbbf6d7d?hp=4e2e6ce45047fe2713546127f3d1ded576e1bf7e

Merge branch 'maint'

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

diff --git a/connect.c b/connect.c
index 844107e295..d2ce57f850 100644
--- a/connect.c
+++ b/connect.c
@@ -217,7 +217,7 @@ static int git_tcp_connect_sock(char *host, int flags)
 	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) ||