Celeste Liu [off-list ref] writes:
The rerere-train script now signs all temporary commits,
which is unnecessary and useless.
Not for me ;-) There must be something else that is forcing it to
behave that way.
This commit turns off gpg signing.
quoted hunk
Signed-off-by: Celeste Liu <redacted>
---
v2: add problem detail in commit message.
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