Merge branch 'il/loosen-remote-helper-names'

* il/loosen-remote-helper-names:
Allow '+', '-' and '.' in remote helper names

diff --combined transport.c
index 1a360cfb48545efbbb97969c6879262e321338cd,d3ec44985994df66fc7e1eeb401b289055dd0f19..f07bd33e86cdfb1b41d2e4d27ad1942fcf326147
--- 1/transport.c
--- 2/transport.c
+++ b/transport.c
@@@ -573,7 -573,7 +573,7 @@@ static int push_had_errors(struct ref *
        return 0;
  }
  
 -static int refs_pushed(struct ref *ref)
 +int transport_refs_pushed(struct ref *ref)
  {
        for (; ref; ref = ref->next) {
                switch(ref->status) {
@@@ -587,7 -587,7 +587,7 @@@
        return 0;
  }
  
 -static void update_tracking_ref(struct remote *remote, struct ref *ref, int verbose)
 +void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose)
  {
        struct refspec rs;
  
@@@ -609,6 -609,8 +609,6 @@@
        }
  }
  
 -#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 -
  static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg, int porcelain)
  {
        if (porcelain) {
@@@ -621,7 -623,7 +621,7 @@@
                else
                        fprintf(stdout, "%s\n", summary);
        } else {
 -              fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
 +              fprintf(stderr, " %c %-*s ", flag, TRANSPORT_SUMMARY_WIDTH, summary);
                if (from)
                        fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
                else
@@@ -709,8 -711,8 +709,8 @@@ static int print_one_push_status(struc
        return 1;
  }
  
 -static void print_push_status(const char *dest, struct ref *refs,
 -                            int verbose, int porcelain, int * nonfastforward)
 +void transport_print_push_status(const char *dest, struct ref *refs,
 +                                int verbose, int porcelain, int *nonfastforward)
  {
        struct ref *ref;
        int n = 0;
@@@ -736,7 -738,7 +736,7 @@@
        }
  }
  
 -static void verify_remote_names(int nr_heads, const char **heads)
 +void transport_verify_remote_names(int nr_heads, const char **heads)
  {
        int i;
  
@@@ -870,6 -872,21 +870,21 @@@ static int is_file(const char *url
        return S_ISREG(buf.st_mode);
  }
  
+ static int isurlschemechar(int first_flag, int ch)
+ {
+       /*
+        * The set of valid URL schemes, as per STD66 (RFC3986) is
+        * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check
+        * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version
+        * of check used '[A-Za-z0-9]+' so not to break any remote
+        * helpers.
+        */
+       int alphanumeric, special;
+       alphanumeric = ch > 0 && isalnum(ch);
+       special = ch == '+' || ch == '-' || ch == '.';
+       return alphanumeric || (!first_flag && special);
+ }
+ 
  static int is_url(const char *url)
  {
        const char *url2, *first_slash;
@@@ -894,7 -911,7 +909,7 @@@
         */
        url2 = url;
        while (url2 < first_slash - 1) {
-               if (!isalnum((unsigned char)*url2))
+               if (!isurlschemechar(url2 == url, (unsigned char)*url2))
                        return 0;
                url2++;
        }
@@@ -916,7 -933,6 +931,7 @@@ struct transport *transport_get(struct 
        if (!remote)
                die("No remote provided to transport_get()");
  
 +      ret->got_remote_refs = 0;
        ret->remote = remote;
        helper = remote->foreign_vcs;
  
@@@ -928,7 -944,7 +943,7 @@@
        if (url) {
                const char *p = url;
  
-               while (isalnum(*p))
+               while (isurlschemechar(p == url, *p))
                        p++;
                if (!prefixcmp(p, "::"))
                        helper = xstrndup(url, p - url);
@@@ -1017,7 -1033,7 +1032,7 @@@ int transport_push(struct transport *tr
                   int *nonfastforward)
  {
        *nonfastforward = 0;
 -      verify_remote_names(refspec_nr, refspec);
 +      transport_verify_remote_names(refspec_nr, refspec);
  
        if (transport->push) {
                /* Maybe FIXME. But no important transport uses this case. */
@@@ -1056,7 -1072,7 +1071,7 @@@
                ret |= err;
  
                if (!quiet || err)
 -                      print_push_status(transport->url, remote_refs,
 +                      transport_print_push_status(transport->url, remote_refs,
                                        verbose | porcelain, porcelain,
                                        nonfastforward);
  
@@@ -1066,10 -1082,10 +1081,10 @@@
                if (!(flags & TRANSPORT_PUSH_DRY_RUN)) {
                        struct ref *ref;
                        for (ref = remote_refs; ref; ref = ref->next)
 -                              update_tracking_ref(transport->remote, ref, verbose);
 +                              transport_update_tracking_ref(transport->remote, ref, verbose);
                }
  
 -              if (!quiet && !ret && !refs_pushed(remote_refs))
 +              if (!quiet && !ret && !transport_refs_pushed(remote_refs))
                        fprintf(stderr, "Everything up-to-date\n");
                return ret;
        }
@@@ -1078,10 -1094,8 +1093,10 @@@
  
  const struct ref *transport_get_remote_refs(struct transport *transport)
  {
 -      if (!transport->remote_refs)
 +      if (!transport->got_remote_refs) {
                transport->remote_refs = transport->get_refs_list(transport, 0);
 +              transport->got_remote_refs = 1;
 +      }
  
        return transport->remote_refs;
  }