fixup! test-gvfs-prococol, t5799: tests for gvfs-helper

`curl version` is not a correct command, therefore that prerequisite
always succeeded by mistake...

Also, the `curl.exe` on the `PATH` is in no way guaranteed to link to
the same libcurl (and hence, cURL version) as `git`. So let's teach the
`gvfs-helper` to optionally report the cURL version (or perform some
version comparison gymnastics).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

gvfs-helper.c

@@ -254,6 +254,7 @@
 #include "wrapper.h"
 #include "packfile.h"
 #include "date.h"
+#include "versioncmp.h"
 
 #define TR2_CAT "gvfs-helper"
 
@@ -286,6 +287,11 @@ static const char *const server_usage[] = {
 	NULL
 };
 
+static const char *const curl_version_usage[] = {
+	N_("git gvfs-helper [<main_options>] curl-version [<operator> <version>]"),
+	NULL
+};
+
 /*
  * "commitDepth" field in gvfs protocol
  */
@@ -4148,6 +4154,37 @@ static enum gh__error_code do_sub_cmd__server(int argc, const char **argv)
 	return ec;
 }
 
+static enum gh__error_code do_sub_cmd__curl_version(int argc, const char **argv)
+{
+	static struct option curl_version_options[] = {
+		OPT_END(),
+	};
+	const char *current_version = curl_version_info(CURLVERSION_NOW)->version;
+
+	trace2_cmd_mode("curl-version");
+
+	if (argc > 1 && !strcmp(argv[1], "-h"))
+		usage_with_options(curl_version_usage, curl_version_options);
+
+	argc = parse_options(argc, argv, NULL,
+			     curl_version_options, curl_version_usage, 0);
+
+	if (argc == 0)
+		printf("%s\n", current_version);
+	else if (argc != 2)
+		die("expected [<operator> <version>], but got %d parameters", argc);
+	else {
+		int cmp = versioncmp(current_version, argv[1]);
+
+		return (strchr(argv[0], '=') && !cmp) ||
+			(strchr(argv[0], '>') && cmp > 0) ||
+			(strchr(argv[0], '<') && cmp < 0) ?
+			GH__ERROR_CODE__OK : GH__ERROR_CODE__ERROR;
+	}
+
+	return GH__ERROR_CODE__OK;
+}
+
 static enum gh__error_code do_sub_cmd(int argc, const char **argv)
 {
 	if (!strcmp(argv[0], "get"))
@@ -4172,6 +4209,9 @@ static enum gh__error_code do_sub_cmd(int argc, const char **argv)
 	if (!strcmp(argv[0], "server"))
 		return do_sub_cmd__server(argc, argv);
 
+	if (!strcmp(argv[0], "curl-version"))
+		return do_sub_cmd__curl_version(argc, argv);
+
 	return GH__ERROR_CODE__USAGE;
 }
 

t/t5799-gvfs-helper.sh

@@ -1123,10 +1123,7 @@ test_expect_success 'http-error: 503 Service Unavailable (with retry and no-fall
 #################################################################
 
 test_lazy_prereq CURL_7_75_OR_NEWER '
-	case "$(curl version | sed -n "1s/^curl \([^ ]*\).*/\1/p")" in
-	""|[0-6].*|7.[0-9]*.*|7.[1-6][0-9].*|7.7[0-4]*.*) return 1;;
-	*) return 0;;
-	esac
+	git gvfs-helper curl-version ">=" 7.75.0
 '
 
 test_expect_success 'HTTP GET Auth on Origin Server' '