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

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

> Junio C Hamano <gitster@pobox.com> writes:
>>> -	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.
>
> Corrected
>
>     git repository http://cante.net/~jaalto/git/git
>     Branch: git-daemon.txt+option--pid-file.collapse
>
>  Documentation/git-daemon.txt |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Phuleeeze.  Try to apply what you sent out with "git am" and
watch the resulting commit log message in horrors!

Hint. "Documentation/SubmittingPatches".

Thanks.  I'll do this by hand so no need to resend.

>
> diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
> index f902161..861d68f 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 ignored.
>  
>  --user=user, --group=group::
>         Change daemon's uid and gid before entering the service loop.