author | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 22:44:20 +0000 (14:44 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 22:44:20 +0000 (14:44 -0800) | ||
commit | 4a295c76d329d1483519e30678d4805636170b70 | |
tree | eb6455c69e2bb2fc93d505c18ba7b4de88df9289 | tree | snapshot |
parent | dac1bc601462790bb2d78be8d5505bb93a256e03 | commit | diff |
parent | a666b472c7d9e72bfacf4145405dbe8924ee153d | commit | diff |
Merge branch 'ef/mingw-daemon' into next
* ef/mingw-daemon:
daemon: opt-out on features that require posix
daemon: make --inetd and --detach incompatible
daemon: use socklen_t
mingw: use poll-emulation from gnulib
mingw: import poll-emulation from gnulib
daemon: get remote host address from root-process
Improve the mingw getaddrinfo stub to handle more use cases
daemon: use full buffered mode for stderr
daemon: use run-command api for async serving
mingw: add kill emulation
mingw: support waitpid with pid > 0 and WNOHANG
mingw: use real pid
inet_ntop: fix a couple of old-style decls
compat: add inet_pton and inet_ntop prototypes
mingw: implement syslog
mingw: add network-wrappers for daemon
Conflicts:
compat/mingw.h
git-compat-util.h
* ef/mingw-daemon:
daemon: opt-out on features that require posix
daemon: make --inetd and --detach incompatible
daemon: use socklen_t
mingw: use poll-emulation from gnulib
mingw: import poll-emulation from gnulib
daemon: get remote host address from root-process
Improve the mingw getaddrinfo stub to handle more use cases
daemon: use full buffered mode for stderr
daemon: use run-command api for async serving
mingw: add kill emulation
mingw: support waitpid with pid > 0 and WNOHANG
mingw: use real pid
inet_ntop: fix a couple of old-style decls
compat: add inet_pton and inet_ntop prototypes
mingw: implement syslog
mingw: add network-wrappers for daemon
Conflicts:
compat/mingw.h
git-compat-util.h
Makefile | diff1 | | diff2 | | blob | history |
compat/mingw.h | diff1 | | diff2 | | blob | history |
daemon.c | diff1 | | diff2 | | blob | history |
git-compat-util.h | diff1 | | diff2 | | blob | history |