refspec: allow colon-less wildcard "refs/category/*"

"git push --tags elsewhere" is implemented in terms of wildcarded refspec
"refs/tags/*" these days, and the user wants to push the tags under the
same name to the other branch.  This resurrects the support for it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 40ed24633f4a63ef9decc1575c4863d1b894ae37..04f7521c29d10abfa4290293e1f6319990e1c0c3 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -417,17 +417,21 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
                        rhs++;
                        rlen = strlen(rhs);
                        is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
                        rhs++;
                        rlen = strlen(rhs);
                        is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));

-                       rs[i].dst = xstrndup(rhs, rlen - is_glob * 2);
+                       if (is_glob)
+                               rlen -= 2;
+                       rs[i].dst = xstrndup(rhs, rlen);

                }
 
                llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
                }
 
                llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));

-               if (is_glob != (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)))
-                       goto invalid;
-
-               if (is_glob) {
+               if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
+                       if ((rhs && !is_glob) || (!rhs && fetch))
+                               goto invalid;
+                       is_glob = 1;

                        llen -= 2;
                        llen -= 2;

-                       rlen -= 2;
+               } else if (rhs && is_glob) {
+                       goto invalid;

                }
                }

+

                rs[i].pattern = is_glob;
                rs[i].src = xstrndup(lhs, llen);
 
                rs[i].pattern = is_glob;
                rs[i].src = xstrndup(lhs, llen);
 


@@ -446,7 +450,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
                        }
                        /*
                         * RHS
                        }
                        /*
                         * RHS

-                        * - missing is allowed.
+                        * - missing is ok, and is same as empty.

                         * - empty is ok; it means not to store.
                         * - otherwise it must be a valid looking ref.
                         */
                         * - empty is ok; it means not to store.
                         * - otherwise it must be a valid looking ref.
                         */