summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Ilari Liusvaara <ilari.liusvaara@elisanet.fi>2010-01-26 20:24:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-26 10:52:52 -0800
commite8dbd76d57806fd1305612d56d56a4cc7665c599 (patch)
tree94d73464c3d270597a73b0e64a3eacc8a731a886 /git-mergetool.sh
parentGit 1.6.5.8 (diff)
downloadtgif-e8dbd76d57806fd1305612d56d56a4cc7665c599.tar.xz
Support addresses with ':' in git-daemon
If host address could have ':' in it (e.g. numeric IPv6 address), then host and port could not be uniquely parsed. Fix this by parsing the "["<host>"]":<port> and "["<host>"]" notations. Currently the built-in git:// client would send <host>:<port> or <host> for such thing, but it doesn't matter as due to bugs, resolving address fails if <host> contains ':'. Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions