From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jul 2016 17:34:43 +0000 (-0700)
Subject: Merge branch 'ew/daemon-socket-keepalive'
X-Git-Tag: v2.10.0-rc0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b48dfd86c90cae3f98dca01101b7e298c0192d16;p=thirdparty%2Fgit.git

Merge branch 'ew/daemon-socket-keepalive'

Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().

* ew/daemon-socket-keepalive:
  Windows: add missing definition of ENOTSOCK
  daemon: ignore ENOTSOCK from setsockopt
---

b48dfd86c90cae3f98dca01101b7e298c0192d16