From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Aug 2007 08:17:17 GMT
Subject: Re: [PATCH] Explain in --pid-file that using --inetd implies it automatically
Message-ID: <7vabsasqk2.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <ejhm3gs6.fsf@cante.net>

Jari Aalto <jari.aalto@cante.net> writes:

> diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
> index f902161..687deb2 100644
> --- a/Documentation/git-daemon.txt
> +++ b/Documentation/git-daemon.txt
> @@ -124,7 +124,8 @@ OPTIONS
>  	Detach from the shell. Implies --syslog.
>  
>  --pid-file=file::
> -	Save the process id in 'file'.
> +	Save the process id in 'file'. When `--inetd` is in use, this
> +        option is not needed.

Is it "is not needed"?  I think you meant to say "is ignored",
IOW, no pid file is written.

Which unfortunately makes the title of your patch wrong as
well X-<. 

I am not seriously suggesting to apply the following patch at
this point, but I think this is what we should have done from
the beginning.

diff --git a/daemon.c b/daemon.c
index 9cf22fe..a7b7990 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1143,8 +1143,8 @@ int main(int argc, char **argv)
 		usage(daemon_usage);
 	}
 
-	if (inetd_mode && (group_name || user_name))
-		die("--user and --group are incompatible with --inetd");
+	if (inetd_mode && (group_name || user_name || pid_file))
+		die("--user, --group and --pid-file are incompatible with --inetd");
 
 	if (inetd_mode && (listen_port || listen_addr))
 		die("--listen= and --port= are incompatible with --inetd");