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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 26b724c8c6d9f273f112e10d1c7c58024403fea4..bd01e430ef7c7e2e19adf5d442606001a90394ee 100755 (executable)
--- 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