* [PATCH v2] contrib/rerere-train: avoid useless gpg sign in training
@ 2022-07-19 13:03 Celeste Liu
2022-07-19 16:26 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Celeste Liu @ 2022-07-19 13:03 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Elijah Newren, Raman Gupta, Celeste Liu
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] contrib/rerere-train: avoid useless gpg sign in training
2022-07-19 13:03 [PATCH v2] contrib/rerere-train: avoid useless gpg sign in training Celeste Liu
@ 2022-07-19 16:26 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-07-19 16:26 UTC (permalink / raw)
To: Celeste Liu; +Cc: git, Elijah Newren, Raman Gupta
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.
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-19 16:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 13:03 [PATCH v2] contrib/rerere-train: avoid useless gpg sign in training Celeste Liu
2022-07-19 16:26 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).