提交 7d19da46 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <gitster@pobox.com>
上级 5cc8f372
...@@ -417,17 +417,21 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp ...@@ -417,17 +417,21 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
rhs++; rhs++;
rlen = strlen(rhs); rlen = strlen(rhs);
is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*")); 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))) if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
goto invalid; if ((rhs && !is_glob) || (!rhs && fetch))
goto invalid;
if (is_glob) { is_glob = 1;
llen -= 2; llen -= 2;
rlen -= 2; } else if (rhs && is_glob) {
goto invalid;
} }
rs[i].pattern = is_glob; rs[i].pattern = is_glob;
rs[i].src = xstrndup(lhs, llen); rs[i].src = xstrndup(lhs, llen);
...@@ -446,7 +450,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp ...@@ -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. * - empty is ok; it means not to store.
* - otherwise it must be a valid looking ref. * - otherwise it must be a valid looking ref.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册