From: Junio C Hamano <gitster@pobox.com>
To: Celeste Liu <coelacanthus@outlook.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Raman Gupta <rocketraman@gmail.com>
Subject: Re: [PATCH] contrib/rerere-train: avoid useless gpg sign in training
Date: Tue, 19 Jul 2022 09:26:02 -0700 [thread overview]
Message-ID: <xmqq4jzdcbmt.fsf@gitster.g> (raw)
In-Reply-To: <PH7PR14MB5594D28D5CF94BD30DB9D3C4CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com> (Celeste Liu's message of "Tue, 19 Jul 2022 19:40:46 +0800")
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
next prev parent reply other threads:[~2022-07-19 16:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-07-19 17:31 ` Celeste Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4jzdcbmt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=coelacanthus@outlook.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=rocketraman@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox