help: print zlib-ng version number
When building against zlib-ng, the header file `zlib.h` is not included, but `zlib-ng.h` is included instead. It's `zlib.h` that defines `ZLIB_VERSION` and that macro is used to print out zlib version in `git-version(1)` with `--build-options`. But when it's not defined, no version is printed. `zlib-ng.h` defines another macro: `ZLIBNG_VERSION`. Use that macro to print the zlib-ng version in `git version --build-options` when it's set. Otherwise fallback to `ZLIB_VERSION`. Signed-off-by: Toon Claes <toon@iotcl.com> Helped-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Toon Claes committed
Mar 7, 2025 at 15:18 UTC
2b1e0f8cd5058c7e0b85760e54706b9e74cb4766
2 files changed
+5
-2
help.c
+3
-1
@@ -776,7 +776,9 @@ void get_version_info(struct strbuf *buf, int show_build_options)
776
#if defined OPENSSL_VERSION_TEXT
777
strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
778
#endif
779
-#if defined ZLIB_VERSION
779
+#if defined ZLIBNG_VERSION
780
+ strbuf_addf(buf, "zlib-ng: %s\n", ZLIBNG_VERSION);
781
+#elif defined ZLIB_VERSION
782
strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION);
783
#endif
784
}
t/t0091-bugreport.sh
+2
-1
@@ -47,7 +47,8 @@ test_expect_success 'sanity check "System Info" section' '
47
# This is bound to differ from environment to environment,
48
# so we just do some rather high-level checks.
49
grep "uname: ." system &&
50
- grep "compiler info: ." system
50
+ grep "compiler info: ." system &&
51
+ grep "zlib." system
52
'
53
54
test_expect_success 'dies if file with same name as report already exists' '