It's possible for git-remote-curl to be built separately from git; in that
case we want to know what version of cURL is used by git-remote-curl, not
necessarily which version was present at git-bugreport's build time.
So instead, ask git-remote-curl for the version information it knows
about.
Today, "git-remote-http" and "git-remote-https" are aliased to
"git-remote-curl"; but in case we rely on a different library than cURL
in the future, let's not explicitly reference cURL from bugreport.
For longevity purposes, invoke the alias "git-remote-https" instead of
"git-remote-http".
Since it could have been built at a different time, also report the
version and built-from commit of git-remote-curl alongside the cURL info.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
Documentation/git-bugreport.txt | 1 +
bugreport.c | 16 ++++++++++++++++
remote-curl.c | 8 ++++++++
3 files changed, 25 insertions(+)
diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
index 643d1b2884..8c7cb9a5d4 100644
--- a/Documentation/git-bugreport.txt
+++ b/Documentation/git-bugreport.txt
@@ -28,6 +28,7 @@ The following information is captured automatically:
- 'git version --build-options'
- uname sysname, release, version, and machine strings
- Compiler-specific info string
+ - 'git remote-https --build-info'
This tool is invoked via the typical Git setup process, which means that in some
cases, it might not be able to launch - for example, if a relevant config file
diff --git a/bugreport.c b/bugreport.c
index 9a470c5588..fb2adfdf14 100644
--- a/bugreport.c
+++ b/bugreport.c
@@ -5,6 +5,18 @@
#include "time.h"
#include "help.h"
#include "compat/compiler.h"
+#include "run-command.h"
+
+static void get_git_remote_https_version_info(struct strbuf *version_info)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ cp.git_cmd = 1;
+ argv_array_push(&cp.args, "remote-https");
+ argv_array_push(&cp.args, "--build-info");
+ if (capture_command(&cp, version_info, 0))
+ strbuf_addstr(version_info, "'git-remote-https --build-info' not supported\n");
+}
static void get_system_info(struct strbuf *sys_info)
{
@@ -29,6 +41,10 @@ static void get_system_info(struct strbuf *sys_info)
strbuf_addstr(sys_info, "compiler info: ");
get_compiler_info(sys_info);
strbuf_complete_line(sys_info);
+
+ strbuf_addstr(sys_info, "git-remote-https --build-info:\n");
+ get_git_remote_https_version_info(sys_info);
+ strbuf_complete_line(sys_info);
}
static const char * const bugreport_usage[] = {
diff --git a/remote-curl.c b/remote-curl.c
index 8eb96152f5..73e52175c0 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -17,6 +17,7 @@
#include "protocol.h"
#include "quote.h"
#include "transport.h"
+#include "version.h"
static struct remote *remote;
/* always ends with a trailing slash */
@@ -1375,6 +1376,13 @@ int cmd_main(int argc, const char **argv)
string_list_init(&options.deepen_not, 1);
string_list_init(&options.push_options, 1);
+ if (!strcmp("--build-info", argv[1])) {
+ printf("git-http-fetch version: %s\n", git_version_string);
+ printf("built from commit: %s\n", git_built_from_commit_string);
+ printf("curl version: %s\n", curl_version());
+ return 0;
+ }
+
/*
* Just report "remote-curl" here (folding all the various aliases
* ("git-remote-http", "git-remote-https", and etc.) here since they
--
2.25.0.265.gbab2e86ba0-goog
