summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Erik Faye-Lund <kusmabite@gmail.com>2011-08-01 13:16:09 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-01 10:47:36 -0700
commite08afecd7fe04b519b72f136c4a24b151c748f49 (patch)
tree2c160be6d05b4d6e43d846ba501778394806c384 /Documentation/git-merge-index.txt
parentBreak down no-lstat() condition checks in verify_uptodate() (diff)
downloadtgif-e08afecd7fe04b519b72f136c4a24b151c748f49.tar.xz
connect: correctly number ipv6 network adapter
In ba50532, the variable 'cnt' was added to both the IPv6 and the IPv4 version of git_tcp_connect_sock, intended to identify which network adapter the connection failed on. But in the IPv6 version, the variable was never increased, leaving it constantly at zero. This behaviour isn't very useful, so let's fix it by increasing the variable at every loop-iteration. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions