From cc391fc886639fb589b4e8da6a4e1a98d3ee07ab Mon Sep 17 00:00:00 2001 From: Celeste Liu Date: Wed, 20 Jul 2022 01:21:44 +0800 Subject: [PATCH] contrib/rerere-train: avoid useless gpg sign in training Users may have configured "git merge" to always require GPG signing the resulting commits. We are not running "git merge" to re-create merge commits, but merely to replay merge conflicts, and we will immediately discard the resulting commits; there is no point in signing them. Override such configuration that forces useless signing from the command line with the "--no-gpg-sign" option. Signed-off-by: Celeste Liu Signed-off-by: Junio C Hamano --- 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