summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-01 21:45:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-01 21:45:02 (GMT)
commit259bcfb6b987021be592ed640253215bcbbf6d7d (patch)
treeee8474ba2caade3d32d3f096aaa007d9dd7f9c83
parent4e2e6ce45047fe2713546127f3d1ded576e1bf7e (diff)
parent3503b8d0da61d920ebd9294fd6a9a0f758328fd3 (diff)
downloadgit-259bcfb6b987021be592ed640253215bcbbf6d7d.zip
git-259bcfb6b987021be592ed640253215bcbbf6d7d.tar.gz
git-259bcfb6b987021be592ed640253215bcbbf6d7d.tar.bz2
Merge branch 'maint'
* maint: connect: correctly number ipv6 network adapter
-rw-r--r--connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/connect.c b/connect.c
index 844107e..d2ce57f 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) ||