From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:58 +0000 (+0900)
Subject: Merge branch 'lw/daemon-log-destination'
X-Git-Tag: v2.18.0-rc0~120
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3?hp=f8fbcd6e01d8e31fb1c7093679538df79b79d90e

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
---

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");
 	}