{"thread":{"id":"39131","subject":"[PATCH] builtin/merge.c: add the merge.verifysignatures config option","startedAt":"2015-04-22T00:13:54Z","lastAt":"2015-04-22T17:55:20Z","messageCount":2,"participants":["Bruno Vieira","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"259782","messageId":"1429661634-45033-1-git-send-email-mail@bmpvieira.com","threadId":"39131","inReplyTo":null,"subject":"[PATCH] builtin/merge.c: add the merge.verifysignatures config option","fromName":"Bruno Vieira","fromEmail":"mail@bmpvieira.com","sentAt":"2015-04-22T00:13:54Z","receivedAt":"2015-04-22T00:13:54Z","isPatch":true,"sender":{"key":"mail@bmpvieira.com","avatar":null},"body":"Signed-off-by: Bruno Vieira <mail@bmpvieira.com>\n---\nThis seemed to be missing. Sorry if otherwise or if I'm doing something wrong (first time contributing).\n\n builtin/merge.c | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 3b0f8f9..5dbc10f 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -598,6 +598,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n \t} else if (!strcmp(k, \"merge.defaulttoupstream\")) {\n \t\tdefault_to_upstream = git_config_bool(k, v);\n \t\treturn 0;\n+\t} else if (!strcmp(k, \"merge.verifysignatures\")) {\n+\t\tverify_signatures = git_config_bool(k, v);\n+\t\treturn 0;\n \t} else if (!strcmp(k, \"commit.gpgsign\")) {\n \t\tsign_commit = git_config_bool(k, v) ? \"\" : NULL;\n \t\treturn 0;\n-- \n2.3.2 (Apple Git-55)\n"},{"id":"259810","messageId":"xmqqsibsdp4n.fsf@gitster.dls.corp.google.com","threadId":"39131","inReplyTo":"1429661634-45033-1-git-send-email-mail@bmpvieira.com","subject":"Re: [PATCH] builtin/merge.c: add the merge.verifysignatures config option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-04-22T17:55:20Z","receivedAt":"2015-04-22T17:55:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bruno Vieira <mail@bmpvieira.com> writes:\n\nThis space before your Signed-off-by: line is a place to justify why\nthis is a good idea.\n\n> Signed-off-by: Bruno Vieira <mail@bmpvieira.com>\n> ---\n> This seemed to be missing. Sorry if otherwise or if I'm doing something wrong (first time contributing).\n>\n>  builtin/merge.c | 3 +++\n>  1 file changed, 3 insertions(+)\n\nMissing are documentation updates and tests.  Tests musth at least\ncover these cases, I think:\n\n - having configuration set to true without --verify-signatures on\n   the command line triggers the check.\n\n - having configuration set to false without the command line option\n   does not trigger the check.\n\n - having configuration set to true with --no-verify-signatures on\n   the command line does not trigger the check.\n\n - having configuration set to false with --verify-signatures on the\n   command line triggers the check.\n\nThanks.\n\n\n> diff --git a/builtin/merge.c b/builtin/merge.c\n> index 3b0f8f9..5dbc10f 100644\n> --- a/builtin/merge.c\n> +++ b/builtin/merge.c\n> @@ -598,6 +598,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n>  \t} else if (!strcmp(k, \"merge.defaulttoupstream\")) {\n>  \t\tdefault_to_upstream = git_config_bool(k, v);\n>  \t\treturn 0;\n> +\t} else if (!strcmp(k, \"merge.verifysignatures\")) {\n> +\t\tverify_signatures = git_config_bool(k, v);\n> +\t\treturn 0;\n>  \t} else if (!strcmp(k, \"commit.gpgsign\")) {\n>  \t\tsign_commit = git_config_bool(k, v) ? \"\" : NULL;\n>  \t\treturn 0;\n"}]}