diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-12 12:06:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-12 12:06:58 -0700 |
| commit | 870c74987be9323012b9a55841143758fe4fccec (patch) | |
| tree | 2f8534d78322b1bc89e2c22c3d64b249ea8ce87c | |
| parent | Merge branch 'ma/clone-doc-markup-fix' (diff) | |
| parent | help: print zlib-ng version number (diff) | |
| download | git-870c74987be9323012b9a55841143758fe4fccec.tar.gz git-870c74987be9323012b9a55841143758fe4fccec.zip | |
Merge branch 'tc/zlib-ng-fix'
"git version --build-options" stopped showing zlib version by
mistake due to recent refactoring, which has been corrected.
* tc/zlib-ng-fix:
help: print zlib-ng version number
help: include git-zlib.h to print zlib version
| -rw-r--r-- | help.c | 5 | ||||
| -rwxr-xr-x | t/t0091-bugreport.sh | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,7 @@ #define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" +#include "git-zlib.h" #include "config.h" #include "builtin.h" #include "exec-cmd.h" @@ -797,7 +798,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) #if defined OPENSSL_VERSION_TEXT strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); #endif -#if defined ZLIB_VERSION +#if defined ZLIBNG_VERSION + strbuf_addf(buf, "zlib-ng: %s\n", ZLIBNG_VERSION); +#elif defined ZLIB_VERSION strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); #endif } diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh index e11d819b62..e38ca7a901 100755 --- a/t/t0091-bugreport.sh +++ b/t/t0091-bugreport.sh @@ -47,7 +47,8 @@ test_expect_success 'sanity check "System Info" section' ' # This is bound to differ from environment to environment, # so we just do some rather high-level checks. grep "uname: ." system && - grep "compiler info: ." system + grep "compiler info: ." system && + grep "zlib." system ' test_expect_success 'dies if file with same name as report already exists' ' |