Merge branch 'jk/unused-params'

diff --git a/remote-curl.c b/remote-curl.c
index c78ba83744451f50ee1a7db65a38d3cc0e984b2a..aad02dcc74b61d0701f1dd599339430df90f8465 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -374,7 +374,7 @@ static void check_smart_http(struct discovery *d, const char *service,
                d->len = reader.src_len;
                d->proto_git = 1;
 
-       } else if (starts_with(reader.line, "version 2")) {
+       } else if (!strcmp(reader.line, "version 2")) {
                /*
                 * v2 smart http; do not consume version packet, which will
                 * be handled elsewhere.
@@ -1385,6 +1385,13 @@ int cmd_main(int argc, const char **argv)
        string_list_init(&options.deepen_not, 1);
        string_list_init(&options.push_options, 1);
 
+       /*
+        * Just report "remote-curl" here (folding all the various aliases
+        * ("git-remote-http", "git-remote-https", and etc.) here since they
+        * are all just copies of the same actual executable.
+        */
+       trace2_cmd_name("remote-curl");
+
        remote = remote_get(argv[1]);
 
        if (argc > 2) {