diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:50 -0800 |
commit | 86faaf90b34570da938432f5c9847af7592bf8be (patch) | |
tree | c19cd0393e8f66b60ec4003aaeb8ca773f53ab42 /daemon.c | |
parent | 6e1c9bb0e0098b921c30d7f4700e14f1ed71a273 (diff) | |
parent | 561b133c2c29ccf5e2aeaa5d6b1da3835e660db8 (diff) | |
download | git-86faaf90b34570da938432f5c9847af7592bf8be.tar.gz |
Merge branch 'cb/git-daemon-tests'
* cb/git-daemon-tests:
git-daemon tests: wait until daemon is ready
git-daemon: produce output when ready
git-daemon: add tests
Diffstat (limited to 'daemon.c')
-rw-r--r-- | daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1086,6 +1086,8 @@ static int serve(struct string_list *listen_addr, int listen_port, drop_privileges(cred); + loginfo("Ready to rumble"); + return service_loop(&socklist); } @@ -1270,10 +1272,8 @@ int main(int argc, char **argv) if (inetd_mode || serve_mode) return execute(); - if (detach) { + if (detach) daemonize(); - loginfo("Ready to rumble"); - } else sanitize_stdfds(); |