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 <coelacanthus@outlook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Celeste Liu committed
Jul 20, 2022 at 01:21 UTC
cc391fc886639fb589b4e8da6a4e1a98d3ee07ab
1 file changed
+1
-1
contrib/rerere-train.sh
+1
-1
@@ -75,7 +75,7 @@ do
75
continue
76
fi
77
git checkout -q "$parent1^0"
78
- if git merge $other_parents >/dev/null 2>&1
78
+ if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
79
then
80
# Cleanly merges
81
continue