| Message ID | 20240621180947.64419-3-randall.becker@nexbridge.ca (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Teach git version --build-options about zlib+libcurl | expand |
Hi Randall, On Fri, 21 Jun 2024, Randall S. Becker wrote: > This change uses the zlib ZLIB_VERSION #define text macro. No > stringification is required for the variable's use. If the #define > is not present, that version is not reported. > > Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> > --- > help.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/help.c b/help.c > index bf74e935b9..f378750af4 100644 > --- a/help.c > +++ b/help.c > @@ -760,6 +760,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) > strbuf_addstr(buf, "feature: fsmonitor--daemon\n"); > #if defined LIBCURL_VERSION > strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION); > +#endif > +#if defined ZLIB_VERSION > + strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); This reports what zlib version Git was linked against, at compile time. That may be misleading e.g. when running with a different version that has a bug. Would `zlibVersion()` be more useful here? Ciao, Johannes > #endif > } > } > -- > 2.43.0 > > >
On Monday, June 24, 2024 10:16 AM, Johannes Schindelin wrote: >On Fri, 21 Jun 2024, Randall S. Becker wrote: > >> This change uses the zlib ZLIB_VERSION #define text macro. No >> stringification is required for the variable's use. If the #define is >> not present, that version is not reported. >> >> Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> >> --- >> help.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/help.c b/help.c >> index bf74e935b9..f378750af4 100644 >> --- a/help.c >> +++ b/help.c >> @@ -760,6 +760,9 @@ void get_version_info(struct strbuf *buf, int >show_build_options) >> strbuf_addstr(buf, "feature: fsmonitor--daemon\n"); #if >defined >> LIBCURL_VERSION >> strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION); >> +#endif >> +#if defined ZLIB_VERSION >> + strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); > >This reports what zlib version Git was linked against, at compile time. >That may be misleading e.g. when running with a different version that has a bug. >Would `zlibVersion()` be more useful here? Please see my comments on the libcurl sub-thread. Same logic applies here. > >Ciao, >Johannes > >> #endif >> } >> } >> -- >> 2.43.0
diff --git a/help.c b/help.c index bf74e935b9..f378750af4 100644 --- a/help.c +++ b/help.c @@ -760,6 +760,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) strbuf_addstr(buf, "feature: fsmonitor--daemon\n"); #if defined LIBCURL_VERSION strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION); +#endif +#if defined ZLIB_VERSION + strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); #endif } }
This change uses the zlib ZLIB_VERSION #define text macro. No stringification is required for the variable's use. If the #define is not present, that version is not reported. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> --- help.c | 3 +++ 1 file changed, 3 insertions(+)