mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tc/zlib-ng-fix'

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2025-03-12 12:06:58 -07:00
commit 870c74987b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
help.c
View File

@ -2,6 +2,7 @@
#define DISABLE_SIGN_COMPARE_WARNINGS #define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h" #include "git-compat-util.h"
#include "git-zlib.h"
#include "config.h" #include "config.h"
#include "builtin.h" #include "builtin.h"
#include "exec-cmd.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 #if defined OPENSSL_VERSION_TEXT
strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
#endif #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); strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION);
#endif #endif
} }

3
t/t0091-bugreport.sh
View File

@ -47,7 +47,8 @@ test_expect_success 'sanity check "System Info" section' '
# This is bound to differ from environment to environment, # This is bound to differ from environment to environment,
# so we just do some rather high-level checks. # so we just do some rather high-level checks.
grep "uname: ." system && 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' ' test_expect_success 'dies if file with same name as report already exists' '