summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:58 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:58 +0900
commitf9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3 (patch)
tree3a9f57126ece22e59b32e168ef0b3dbc1e704982
parentMerge branch 'mn/send-email-credential-doc' (diff)
parentdaemon.c: fix condition for redirecting stderr (diff)
downloadtgif-f9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3.tar.xz
Merge branch 'lw/daemon-log-destination'
Recent introduction of "--log-destination" option to "git daemon" did not work well when the daemon was run under "--inetd" mode. * lw/daemon-log-destination: daemon.c: fix condition for redirecting stderr
-rw-r--r--daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index fe833ea7de..9d2e0d20ef 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1459,7 +1459,7 @@ int cmd_main(int argc, const char **argv)
die("base-path '%s' does not exist or is not a directory",
base_path);
- if (inetd_mode) {
+ if (log_destination != LOG_DESTINATION_STDERR) {
if (!freopen("/dev/null", "w", stderr))
die_errno("failed to redirect stderr to /dev/null");
}