promisor-remote: clarify that a remote is ignored

In should_accept_remote() and parse_one_advertised_remote(), when a
remote is ignored, we tell users why it is ignored in a warning, but we
don't tell them that the remote is actually ignored.

Let's clarify that, so users have a better idea of what's actually
happening.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/promisor-remote.c b/promisor-remote.c
index 6c935f855af7525389e8ed6ea7f9b56733e534e9..8e062ec16098ac098a05f7b7b4c5f1423f34f9b8 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -670,15 +670,16 @@ static int should_accept_remote(enum accept_promisor accept,
                BUG("Unhandled 'enum accept_promisor' value '%d'", accept);
 
        if (!remote_url || !*remote_url) {
-               warning(_("no or empty URL advertised for remote '%s'"), remote_name);
+               warning(_("no or empty URL advertised for remote '%s', "
+                         "ignoring this remote"), remote_name);
                return 0;
        }
 
        if (!strcmp(p->url, remote_url))
                return all_fields_match(advertised, config_info, p);
 
-       warning(_("known remote named '%s' but with URL '%s' instead of '%s'"),
-               remote_name, p->url, remote_url);
+       warning(_("known remote named '%s' but with URL '%s' instead of '%s', "
+                 "ignoring this remote"), remote_name, p->url, remote_url);
 
        return 0;
 }
@@ -722,8 +723,8 @@ static struct promisor_info *parse_one_advertised_remote(const char *remote_info
        string_list_clear(&elem_list, 0);
 
        if (!info->name || !info->url) {
-               warning(_("server advertised a promisor remote without a name or URL: %s"),
-                       remote_info);
+               warning(_("server advertised a promisor remote without a name or URL: '%s', "
+                         "ignoring this remote"), remote_info);
                promisor_info_free(info);
                return NULL;
        }