[PATCH] contrib/rerere-train: avoid useless gpg sign in training

[PATCH] contrib/rerere-train: avoid useless gpg sign in training

[Celeste Liu]

Signed-off-by: Celeste Liu <coelacanthus@outlook.com>
---
 contrib/rerere-train.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 26b724c8c6..bd01e430ef 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -75,7 +75,7 @@ do
 		continue
 	fi
 	git checkout -q "$parent1^0"
-	if git merge $other_parents >/dev/null 2>&1
+	if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
 	then
 		# Cleanly merges
 		continue
-- 
2.37.1

Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training

[Junio C Hamano]

Celeste Liu <coelacanthus@outlook.com> writes:

> Signed-off-by: Celeste Liu <coelacanthus@outlook.com>
> ---

Above your sign-off line is a space to explain why this change is
needed.  Write something like 

    The user may have configured "git merge" to always require GPG
    signing the resulting commit.  As we run "git merge" not for the
    recreated merge commits, but merely to trigger merge conflicts,
    and we will discard the resulting commits, signing them is not
    necessary.

    Override such configuration that forces useless signing from the
    command line with the "--no-gpg-sign" optoin.

perhaps?

>  contrib/rerere-train.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
> index 26b724c8c6..bd01e430ef 100755
> --- a/contrib/rerere-train.sh
> +++ b/contrib/rerere-train.sh
> @@ -75,7 +75,7 @@ do
>  		continue
>  	fi
>  	git checkout -q "$parent1^0"
> -	if git merge $other_parents >/dev/null 2>&1
> +	if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
>  	then
>  		# Cleanly merges
>  		continue

Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training

[Celeste Liu]

[-- Attachment #1: Type: text/plain, Size: 622 bytes --]

at 09:26:02AM -0700, Junio C Hamano wrote:
> Celeste Liu <coelacanthus@outlook.com> writes:
> needed.  Write something like
>
>     The user may have configured "git merge" to always require GPG
>     signing the resulting commit.  As we run "git merge" not for the
>     recreated merge commits, but merely to trigger merge conflicts,
>     and we will discard the resulting commits, signing them is not
>     necessary.
>
>     Override such configuration that forces useless signing from the
>     command line with the "--no-gpg-sign" optoin.
>
> perhaps?
>

Ok, I will add in next verison.
(Sorry, forgot cc, resend)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]