Re: [PATCH v3 5/7] gpg-interface: introduce new config to select per gpg format program
Am Mon, 16 Jul 2018 13:45:40 -0700
schrieb Junio C Hamano :
> Henning Schild writes:
>
> > +gpg..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.
> 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
> > 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) {
Re: [PATCH v3 5/7] gpg-interface: introduce new config to select per gpg format program
Henning Schild writes:
> +gpg..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.
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`.
> 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) {
[PATCH v3 5/7] gpg-interface: introduce new config to select per gpg format program
Supporting multiple signing formats we will have the need to configure a
custom program each. Add a new config value to cater for that.
Signed-off-by: Henning Schild
---
Documentation/config.txt | 5 +
gpg-interface.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ac373e3f4..c0bd80954 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1832,6 +1832,11 @@ gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
Default is "openpgp", that is also the only supported value.
+gpg..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.
+
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) {
--
2.16.4
