From: Junio C Hamano <gitster@pobox•com>
To: Bruno Vieira <mail@bmpvieira•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] builtin/merge.c: add the merge.verifysignatures config option
Date: Wed, 22 Apr 2015 10:55:20 -0700 [thread overview]
Message-ID: <xmqqsibsdp4n.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1429661634-45033-1-git-send-email-mail@bmpvieira.com> (Bruno Vieira's message of "Wed, 22 Apr 2015 01:13:54 +0100")
Bruno Vieira <mail@bmpvieira•com> writes:
This space before your Signed-off-by: line is a place to justify why
this is a good idea.
> Signed-off-by: Bruno Vieira <mail@bmpvieira•com>
> ---
> This seemed to be missing. Sorry if otherwise or if I'm doing something wrong (first time contributing).
>
> builtin/merge.c | 3 +++
> 1 file changed, 3 insertions(+)
Missing are documentation updates and tests. Tests musth at least
cover these cases, I think:
- having configuration set to true without --verify-signatures on
the command line triggers the check.
- having configuration set to false without the command line option
does not trigger the check.
- having configuration set to true with --no-verify-signatures on
the command line does not trigger the check.
- having configuration set to false with --verify-signatures on the
command line triggers the check.
Thanks.
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 3b0f8f9..5dbc10f 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -598,6 +598,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)
> } else if (!strcmp(k, "merge.defaulttoupstream")) {
> default_to_upstream = git_config_bool(k, v);
> return 0;
> + } else if (!strcmp(k, "merge.verifysignatures")) {
> + verify_signatures = git_config_bool(k, v);
> + return 0;
> } else if (!strcmp(k, "commit.gpgsign")) {
> sign_commit = git_config_bool(k, v) ? "" : NULL;
> return 0;
prev parent reply other threads:[~2015-04-22 17:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 0:13 [PATCH] builtin/merge.c: add the merge.verifysignatures config option Bruno Vieira
2015-04-22 17:55 ` Junio C Hamano [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsibsdp4n.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mail@bmpvieira$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox