Re: [PATCH v3 5/7] gpg-interface: introduce new config to select per gpg format program

From: Henning Schild <henning.schild@siemens.com>
Date: Jul 17, 2018, 12:50 UTC
Message-ID: <20180717145002.2623286d@md1pvb1c.ad001.siemens.net>
In-Reply-To: <xmqqva9esydn.fsf@gitster-ct.c.googlers.com>

Am Mon, 16 Jul 2018 13:45:40 -0700 schrieb Junio C Hamano <gitster@pobox.com>:

Show 10 quoted lines

> Henning Schild <henning.schild@siemens.com> writes:
> 
> > +gpg.<format>.program::
> > +	Use this to customize the program used for the signing
> > format you
> > +	chose. (see gpg.program) gpg.openpgp.program is a synonym
> > for the
> > +	legacy gpg.program.  
> 
> I _think_ you meant "see gpg.format", but I am not 100% sure.

No i actually meant program, the next version just refers to both config options for further reading.

Show 11 quoted lines

> When X is a synonym for Y, Y is also a synonym for X, so technically
> speaking this does not matter, but when we talk about backward
> compatibility fallback, I think we say "OLDway is retained as a
> legacy synonym for NEWway", i.e. the other way around.
> 
> Also, `typeset in tt` what end-users would type literally, like
> configuration variable names, i.e.
> 
> 	Use this to customize the rpogram used for the signing
> 	format you chose (see `gpg.format`).  `gpg.program` can
> 	still be used as a legacy synonym for `gpg.openpgp.program`.

Used that second sentence.

Henning

Show 16 quoted lines

> >  gui.commitMsgWidth::
> >  	Defines how wide the commit message window is in the
> >  	linkgit:git-gui[1]. "75" is the default.
> > diff --git a/gpg-interface.c b/gpg-interface.c
> > index 93bd0fb32..f3c22b551 100644
> > --- a/gpg-interface.c
> > +++ b/gpg-interface.c
> > @@ -182,7 +182,7 @@ int git_gpg_config(const char *var, const char
> > *value, void *cb) return 0;
> >  	}
> >  
> > -	if (!strcmp(var, "gpg.program"))
> > +	if (!strcmp(var, "gpg.program") || !strcmp(var,
> > "gpg.openpgp.program")) fmtname = "openpgp";
> >  
> >  	if (fmtname) {