Skip to content

Commit f9bcd75

Browse files
committed
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
2 parents f8fbcd6 + e67d906 commit f9bcd75

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

daemon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ int cmd_main(int argc, const char **argv)
14591459
die("base-path '%s' does not exist or is not a directory",
14601460
base_path);
14611461

1462-
if (inetd_mode) {
1462+
if (log_destination != LOG_DESTINATION_STDERR) {
14631463
if (!freopen("/dev/null", "w", stderr))
14641464
die_errno("failed to redirect stderr to /dev/null");
14651465
}

0 commit comments

Comments
 (0)