From: Junio C Hamano <gitster@pobox.com>
To: Marius Paliga <marius.paliga@gmail.com>
Cc: Thais Diniz <thais.dinizbraz@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH] Added support for new configuration parameter push.pushOption
Date: Wed, 18 Oct 2017 10:04:04 +0900 [thread overview]
Message-ID: <xmqqmv4pl117.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqvajdl1hn.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 18 Oct 2017 09:54:12 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> base to show an incremental improvement, but here is how I would do
> the "code" part.
>
> builtin/push.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/push.c b/builtin/push.c
> index 03846e8379..89ef029c67 100644
> --- a/builtin/push.c
> +++ b/builtin/push.c
> @@ -32,6 +32,8 @@ static const char **refspec;
> static int refspec_nr;
> static int refspec_alloc;
>
> +static struct string_list push_options_config = STRING_LIST_INIT_DUP;
> +
> static void add_refspec(const char *ref)
> {
> refspec_nr++;
> @@ -503,6 +505,13 @@ static int git_push_config(const char *k, const char *v, void *cb)
> int val = git_config_bool(k, v) ?
> RECURSE_SUBMODULES_ON_DEMAND : RECURSE_SUBMODULES_OFF;
> recurse_submodules = val;
> + } else if (!strcmp(k, "push.pushoption")) {
> + if (!v)
> + return config_error_nonbool(k);
> + else if (!*v)
> + string_list_clear(&push_options_config, 0);
> + else
> + string_list_append(&push_options_config, v);
Here needs to be
return 0;
as there is no point in falling through to call
git_default_config().
> }
>
> return git_default_config(k, v, NULL);
next prev parent reply other threads:[~2017-10-18 1:04 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 [this message]
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
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=xmqqmv4pl117.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=marius.paliga@gmail.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).