[PATCH v3] contrib/rerere-train: avoid useless gpg sign in training
- From
Celeste Liu <coelacanthus@outlook.com>
- Date
- Jul 19, 2022, 17:21 UTC
- Message-ID
- <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
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> --- v2: add problem detail in commit message. v3: more detailed reason
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
-- 2.37.1