{"thread":{"id":"58185","subject":"[PATCH] contrib/rerere-train: avoid useless gpg sign in training","startedAt":"2022-07-19T11:46:43Z","lastAt":"2022-07-19T17:32:00Z","messageCount":3,"participants":["Celeste Liu","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"459353","messageId":"PH7PR14MB5594D28D5CF94BD30DB9D3C4CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com","threadId":"58185","inReplyTo":null,"subject":"[PATCH] contrib/rerere-train: avoid useless gpg sign in training","fromName":"Celeste Liu","fromEmail":"coelacanthus@outlook.com","sentAt":"2022-07-19T11:40:46Z","receivedAt":"2022-07-19T11:46:43Z","isPatch":true,"sender":{"key":"coelacanthus@outlook.com","avatar":"https://avatars.githubusercontent.com/u/43064781?v=4"},"body":"Signed-off-by: Celeste Liu <coelacanthus@outlook.com>\n---\n contrib/rerere-train.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh\nindex 26b724c8c6..bd01e430ef 100755\n--- a/contrib/rerere-train.sh\n+++ b/contrib/rerere-train.sh\n@@ -75,7 +75,7 @@ do\n \t\tcontinue\n \tfi\n \tgit checkout -q \"$parent1^0\"\n-\tif git merge $other_parents >/dev/null 2>&1\n+\tif git merge --no-gpg-sign $other_parents >/dev/null 2>&1\n \tthen\n \t\t# Cleanly merges\n \t\tcontinue\n-- \n2.37.1\n\n"},{"id":"459382","messageId":"xmqq4jzdcbmt.fsf@gitster.g","threadId":"58185","inReplyTo":"PH7PR14MB5594D28D5CF94BD30DB9D3C4CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com","subject":"Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-07-19T16:26:02Z","receivedAt":"2022-07-19T16:26:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Celeste Liu <coelacanthus@outlook.com> writes:\n\n> Signed-off-by: Celeste Liu <coelacanthus@outlook.com>\n> ---\n\nAbove your sign-off line is a space to explain why this change is\nneeded.  Write something like \n\n    The user may have configured \"git merge\" to always require GPG\n    signing the resulting commit.  As we run \"git merge\" not for the\n    recreated merge commits, but merely to trigger merge conflicts,\n    and we will discard the resulting commits, signing them is not\n    necessary.\n\n    Override such configuration that forces useless signing from the\n    command line with the \"--no-gpg-sign\" optoin.\n\nperhaps?\n\n>  contrib/rerere-train.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh\n> index 26b724c8c6..bd01e430ef 100755\n> --- a/contrib/rerere-train.sh\n> +++ b/contrib/rerere-train.sh\n> @@ -75,7 +75,7 @@ do\n>  \t\tcontinue\n>  \tfi\n>  \tgit checkout -q \"$parent1^0\"\n> -\tif git merge $other_parents >/dev/null 2>&1\n> +\tif git merge --no-gpg-sign $other_parents >/dev/null 2>&1\n>  \tthen\n>  \t\t# Cleanly merges\n>  \t\tcontinue\n"},{"id":"459391","messageId":"PH7PR14MB5594F83B5CD207AC45D8A39ECE8F9@PH7PR14MB5594.namprd14.prod.outlook.com","threadId":"58185","inReplyTo":"xmqq4jzdcbmt.fsf@gitster.g","subject":"Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training","fromName":"Celeste Liu","fromEmail":"coelacanthus@outlook.com","sentAt":"2022-07-19T17:31:49Z","receivedAt":"2022-07-19T17:32:00Z","isPatch":true,"sender":{"key":"coelacanthus@outlook.com","avatar":"https://avatars.githubusercontent.com/u/43064781?v=4"},"body":"at 09:26:02AM -0700, Junio C Hamano wrote:\n> Celeste Liu <coelacanthus@outlook.com> writes:\n> needed.  Write something like\n>\n>     The user may have configured \"git merge\" to always require GPG\n>     signing the resulting commit.  As we run \"git merge\" not for the\n>     recreated merge commits, but merely to trigger merge conflicts,\n>     and we will discard the resulting commits, signing them is not\n>     necessary.\n>\n>     Override such configuration that forces useless signing from the\n>     command line with the \"--no-gpg-sign\" optoin.\n>\n> perhaps?\n>\n\nOk, I will add in next verison.\n(Sorry, forgot cc, resend)\n"}]}