diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:23 -0700 |
| commit | dc11fc2de8d92b9e7935ad070941e86f4e33000b (patch) | |
| tree | 9c12f75d617fb6de47aa3638e96a4746c0a1f4bf /git-mergetool.sh | |
| parent | Merge branch 'dt/cache-tree-repair' (diff) | |
| parent | daemon: remove write-only variable maxfd (diff) | |
| download | tgif-dc11fc2de8d92b9e7935ad070941e86f4e33000b.tar.xz | |
Merge branch 'rs/daemon-fixes'
"git daemon" (with NO_IPV6 build configuration) used to incorrectly
use the hostname even when gethostbyname() reported that the given
hostname is not found.
* rs/daemon-fixes:
daemon: remove write-only variable maxfd
daemon: fix error message after bind()
daemon: handle gethostbyname() error
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions