Re: [PATCH v2] contrib/rerere-train: avoid useless gpg sign in training
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 19, 2022, 16:26 UTC
- Message-ID
- <xmqqzgh5ax1d.fsf@gitster.g>
- In-Reply-To
- <PH7PR14MB5594BE1B100435DCD28C1E45CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
Celeste Liu <coelacanthus@outlook.com> 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.
Show 22 quoted lines
> > Signed-off-by: Celeste Liu <coelacanthus@outlook.com> > --- > > 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