From: Toon Claes <toon@iotcl.com>
Date: Fri, 7 Mar 2025 14:18:07 +0000 (+0100)
Subject: help: include git-zlib.h to print zlib version
X-Git-Tag: v2.49.0~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49d9cd8dea520a318412792b50ab4b91ce71b9fe;p=thirdparty%2Fgit.git

help: include git-zlib.h to print zlib version

In 41f1a8435a (git-compat-util: move include of "compat/zlib.h" into
"git-zlib.h", 2025-01-28) some code was refactored to enable easier
linking against zlib-ng.

This removed `zlib.h` being indirectly included in `help.c`. As this
file uses `ZLIB_VERSION` to print the version number of zlib when
running git-version(1) with `--build-options`, this resulted in a
regression.

Include `git-zlib.h` directly into `help.c` to print zlib version
information. This brings back the zlib version in the output of
`git version --build-options`.

Signed-off-by: Toon Claes <toon@iotcl.com>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/help.c b/help.c
index 5483ea8fd2..d3d3adcc5c 100644
--- a/help.c
+++ b/help.c
@@ -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"