diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:58 +0900 |
commit | f9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3 (patch) | |
tree | 3a9f57126ece22e59b32e168ef0b3dbc1e704982 /daemon.c | |
parent | f8fbcd6e01d8e31fb1c7093679538df79b79d90e (diff) | |
parent | e67d906d735166f2068f1e4cc393220483a97f30 (diff) | |
download | git-f9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3.tar.gz |
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
Diffstat (limited to 'daemon.c')
-rw-r--r-- | daemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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"); } |