threads / patch / 58186

v2contrib/rerere-train: avoid useless gpg sign in training

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

## tl;dr

2 messages between Jul 19, 2022 and Jul 19, 2022. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Celeste Liu· Jul 19, 2022, 13:03 UTC · lore

The rerere-train script now signs all temporary commits, which is unnecessary and useless. This commit turns off gpg signing.

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

v2: add problem detail in commit message.

 contrib/rerere-train.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/rerere-train.sh +1 −1

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

Junio C Hamano· Jul 19, 2022, 16:26 UTC · re: Celeste Liu · lore

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

Celeste Liu <coelacanthus@outlook.com> writes:

> The rerere-train script now signs all temporary commits,
> which is unnecessary and useless.

Not for me ;-) There must be something else that is forcing it to behave that way.

> This commit turns off gpg signing.

Show 22 quoted lines

>
> Signed-off-by: Celeste Liu <coelacanthus@outlook.com>
> ---
>
> v2: add problem detail in commit message.
>
>  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