* [PATCH] contrib/rerere-train: avoid useless gpg sign in training
@ 2022-07-19 11:40 Celeste Liu
2022-07-19 16:26 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Celeste Liu @ 2022-07-19 11:40 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Elijah Newren, Raman Gupta, 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training
2022-07-19 11:40 [PATCH] contrib/rerere-train: avoid useless gpg sign in training Celeste Liu
@ 2022-07-19 16:26 ` Junio C Hamano
2022-07-19 17:31 ` Celeste Liu
0 siblings, 1 reply; 3+ 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:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training
2022-07-19 16:26 ` Junio C Hamano
@ 2022-07-19 17:31 ` Celeste Liu
0 siblings, 0 replies; 3+ messages in thread
From: Celeste Liu @ 2022-07-19 17:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Elijah Newren, Raman Gupta
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-19 17:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 11:40 [PATCH] contrib/rerere-train: avoid useless gpg sign in training Celeste Liu
2022-07-19 16:26 ` Junio C Hamano
2022-07-19 17:31 ` Celeste Liu
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).