mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/rerere-train: avoid useless gpg sign in training

Browse Source 
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>
This commit is contained in:
Celeste Liu
2022-07-20 01:21:44 +08:00
committed by Junio C Hamano
parent bbea4dcf42
commit cc391fc886
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rerere-train.sh
View File

@ -75,7 +75,7 @@ do
continue continue
fi fi
git checkout -q "$parent1^0" 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 then
# Cleanly merges # Cleanly merges
continue continue