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 /help.c | |
| parent | 066590497ea492cc14bea7f3790eae59b2d957fd (diff) | |
| parent | 2b1e0f8cd5058c7e0b85760e54706b9e74cb4766 (diff) | |
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
Diffstat (limited to 'help.c')
| -rw-r--r-- | help.c | 5 |
1 files changed, 4 insertions, 1 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 } |