Merge branch 'maint'

diff --git a/builtin-remote.c b/builtin-remote.c
index f7d66189ccefe903588c7bbf044c2bc909c50b5a..d7ab6b2d5ff872c7872648bae4c97d7e1aa3ebba 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -1005,9 +1005,12 @@ static int show(int argc, const char **argv)
 
                get_remote_ref_states(*argv, &states, query_flag);
 
-               printf("* remote %s\n  URL: %s\n", *argv,
-                       states.remote->url_nr > 0 ?
-                               states.remote->url[0] : "(no URL)");
+               printf("* remote %s\n", *argv);
+               if (states.remote->url_nr) {
+                       for (i=0; i < states.remote->url_nr; i++)
+                               printf("  URL: %s\n", states.remote->url[i]);
+               } else
+                       printf("  URL: %s\n", "(no URL)");
                if (no_query)
                        printf("  HEAD branch: (not queried)\n");
                else if (!states.heads.nr)