From: Marius Paliga <marius.paliga@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Christian Couder <christian.couder@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Jeff King <peff@peff.net>,
Thais Diniz <thais.dinizbraz@gmail.com>
Subject: Re: [PATCH] builtin/push.c: add push.pushOption config
Date: Fri, 20 Oct 2017 10:52:25 +0200 [thread overview]
Message-ID: <CAK7vU=0m6qyFrPb9E7HY79v0Vxwn+So3gyhxJZBPVD1t7vX35A@mail.gmail.com> (raw)
In-Reply-To: <xmqqy3o6gx4z.fsf@gitster.mtv.corp.google.com>
> --o::
> ---push-option::
> +-o <option>::
> +--push-option=<option>::
> Transmit the given string to the server, which passes them to
> the pre-receive as well as the post-receive hook. The given string
> must not contain a NUL or LF character.
> - When no `--push-option <option>` is given from the command
> + When no `--push-option=<option>` is given from the command
> line, the values of configuration variable `push.pushOption`
> are used instead.
Should we also mention that this option can take multiple values from
the command line?
-o <option>::
--push-option=<option>::
Transmit the given string to the server, which passes them to
the pre-receive as well as the post-receive hook. The given string
must not contain a NUL or LF character.
+ Multiple `--push-option=<option>` are allowed on the command line.
When no `--push-option=<option>` is given from the command
line, the values of configuration variable `push.pushOption`
are used instead.
2017-10-20 8:18 GMT+02:00 Junio C Hamano <gitster@pobox.com>:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>>> We'd also want to document how push.pushOption works in
>>>> Documentation/config.txt (that contains all the configs)
>>>
>>> Perhaps.
>>
>> Here is my attempt.
>
> Another thing I noticed while we are around the area is that unlike
> all other options in git-push.txt page, this one forgets to say it
> always takes mandatory string. Here is a possible fix.
>
> Documentation/git-push.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index aa78057dc5..a8504e0ae3 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -156,12 +156,12 @@ already exists on the remote side.
> Either all refs are updated, or on error, no refs are updated.
> If the server does not support atomic pushes the push will fail.
>
> --o::
> ---push-option::
> +-o <option>::
> +--push-option=<option>::
> Transmit the given string to the server, which passes them to
> the pre-receive as well as the post-receive hook. The given string
> must not contain a NUL or LF character.
> - When no `--push-option <option>` is given from the command
> + When no `--push-option=<option>` is given from the command
> line, the values of configuration variable `push.pushOption`
> are used instead.
>
next prev parent reply other threads:[~2017-10-20 8:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 6:32 [PATCH] Added support for new configuration parameter push.pushOption Marius Paliga
2017-10-18 0:54 ` Junio C Hamano
2017-10-18 1:04 ` Junio C Hamano
2017-10-19 17:47 ` [PATCH] builtin/push.c: add push.pushOption config Marius Paliga
2017-10-19 19:46 ` Stefan Beller
2017-10-20 2:19 ` Junio C Hamano
2017-10-20 6:17 ` Junio C Hamano
2017-10-20 6:18 ` Junio C Hamano
2017-10-20 8:52 ` Marius Paliga [this message]
2017-10-21 1:33 ` Junio C Hamano
2017-10-20 19:02 ` Stefan Beller
2017-10-21 1:52 ` Junio C Hamano
2017-10-23 11:44 ` Marius Paliga
2017-10-24 0:59 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAK7vU=0m6qyFrPb9E7HY79v0Vxwn+So3gyhxJZBPVD1t7vX35A@mail.gmail.com' \
--to=marius.paliga@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=thais.dinizbraz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).