git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Randall S. Becker" <the.n.e.key@gmail.com>,
	git@vger.kernel.org,
	"Randall S. Becker" <randall.becker@nexbridge.ca>,
	"Randall S . Becker" <rsbecker@nexbridge.com>
Subject: Re: [PATCH v2 1/2] Teach git version --build-options about libcurl
Date: Mon, 24 Jun 2024 11:29:47 -0400	[thread overview]
Message-ID: <20240624152947.GA20600@coredump.intra.peff.net> (raw)
In-Reply-To: <f44f1e25-41ca-0784-3186-f9e1bdae0d4f@gmx.de>

On Mon, Jun 24, 2024 at 04:13:23PM +0200, Johannes Schindelin wrote:

> > @@ -757,6 +758,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);
> 
> I am not sure that this is the most helpful information Git can provide:
> It reports the version against which Git was _compiled_, whereas the
> version it is _running against_ might be quite different.
> 
> Wouldn't calling `curl_version()` make more sense here?

I had a similar thought (and possibly even mentioning both the build
version and runtime version could be useful). But I don't think we can
call curl_version() here, as the main Git binary is (intentionally) not
linked against libcurl at all.

Even #including curl.h feels a little iffy to me, as it is declaring a
bunch of symbols that we will not have access to. It works here because
LIBCURL_VERSION is presumably a string literal, and not a reference to a
symbol. But if anybody mistakenly mentioned another symbol, the
compilation would work OK, but we'd fail at link time. Maybe an
acceptable risk, though.

-Peff

  parent reply	other threads:[~2024-06-24 15:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-21 18:09 [PATCH v2 0/2] Teach git version --build-options about zlib+libcurl Randall S. Becker
2024-06-21 18:09 ` [PATCH v2 1/2] Teach git version --build-options about libcurl Randall S. Becker
2024-06-24 14:13   ` Johannes Schindelin
2024-06-24 14:33     ` Randall Becker
2024-06-24 17:08       ` Dragan Simic
2024-06-24 21:15         ` rsbecker
2024-06-24 21:52           ` Dragan Simic
2024-06-24 21:56             ` Randall Becker
2024-07-24 10:51       ` Johannes Schindelin
2024-06-24 15:29     ` Jeff King [this message]
2024-06-24 16:06     ` Junio C Hamano
2024-06-24 23:55       ` Jeff King
2024-06-25  0:00         ` Junio C Hamano
2024-07-24 10:48         ` Johannes Schindelin
2024-07-24 20:55           ` Jeff King
2024-07-24 22:17             ` Johannes Schindelin
2024-07-25  6:52               ` Jeff King
2024-07-25 15:28                 ` Junio C Hamano
2024-07-26  0:41                   ` Jeff King
2024-06-21 18:09 ` [PATCH v2 2/2] Teach git version --build-options about zlib versions Randall S. Becker
2024-06-24 14:15   ` Johannes Schindelin
2024-06-24 14:38     ` Randall Becker
2024-07-24 11:02       ` Johannes Schindelin
2024-07-24 13:36         ` Randall Becker
2024-07-24 16:21           ` Junio C Hamano
2024-07-24 16:33             ` rsbecker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240624152947.GA20600@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=randall.becker@nexbridge.ca \
    --cc=rsbecker@nexbridge.com \
    --cc=the.n.e.key@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).