]> git.ipfire.org Git - thirdparty/git.git/commitdiff
version: teach --build-options to reports libcurl version information
authorRandall S. Becker <the.n.e.key@gmail.com>
Fri, 21 Jun 2024 18:09:46 +0000 (14:09 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2024 23:40:43 +0000 (16:40 -0700)
Show LIBCURL_VERSION, if defined, in "git version --build-options"
output.

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
help.c

diff --git a/help.c b/help.c
index ce55aaa2c0bcd5f9242a3502c7dbee3f27689fba..92bfef140bbdca3053a00cd77bb011ebced46854 100644 (file)
--- a/help.c
+++ b/help.c
 #include "prompt.h"
 #include "fsmonitor-ipc.h"
 
+#ifndef NO_CURL
+#include "git-curl-compat.h" /* For LIBCURL_VERSION only */
+#endif
+
 struct category_description {
        uint32_t category;
        const char *desc;
@@ -757,6 +761,9 @@ void get_version_info(struct strbuf *buf, int show_build_options)
 
                if (fsmonitor_ipc__is_supported())
                        strbuf_addstr(buf, "feature: fsmonitor--daemon\n");
+#if defined LIBCURL_VERSION
+               strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION);
+#endif
 #if defined OPENSSL_VERSION_TEXT
                strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
 #endif