| Message ID | PH7PR14MB5594D28D5CF94BD30DB9D3C4CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | contrib/rerere-train: avoid useless gpg sign in training | expand |
Celeste Liu <coelacanthus@outlook.com> writes: > Signed-off-by: Celeste Liu <coelacanthus@outlook.com> > --- Above your sign-off line is a space to explain why this change is needed. Write something like The user may have configured "git merge" to always require GPG signing the resulting commit. As we run "git merge" not for the recreated merge commits, but merely to trigger merge conflicts, and we will discard the resulting commits, signing them is not necessary. Override such configuration that forces useless signing from the command line with the "--no-gpg-sign" optoin. perhaps? > 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
at 09:26:02AM -0700, Junio C Hamano wrote: > Celeste Liu <coelacanthus@outlook.com> writes: > needed. Write something like > > The user may have configured "git merge" to always require GPG > signing the resulting commit. As we run "git merge" not for the > recreated merge commits, but merely to trigger merge conflicts, > and we will discard the resulting commits, signing them is not > necessary. > > Override such configuration that forces useless signing from the > command line with the "--no-gpg-sign" optoin. > > perhaps? > Ok, I will add in next verison. (Sorry, forgot cc, resend)
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
Signed-off-by: Celeste Liu <coelacanthus@outlook.com> --- contrib/rerere-train.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)