Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes:
> OTOH, the only use for such a pattern is an octopus merge of whatever
> branches a remote happens to have, right? I remember thinking this was a
> non-useful refspec when I was dealing with the fetch code (and then
> forgetting that it was useful for push). It might be better to just
> disallow it in the direction-specific semantic checks.
I agree. refs/*:refs/* could have been useful before --mirror, but refs/*
(fetch but not store) is not useful at all, so what I plan to commit looks
like this (i.e. "the third time lucky" edition).
-- >8 --
[PATCH] 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@xxxxxxxxx>
---
remote.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/remote.c b/remote.c
index 40ed246..04f7521 100644
--- 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, "/*"));
- 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));
- 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;
- rlen -= 2;
+ } else if (rhs && is_glob) {
+ goto invalid;
}
j+
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
- * - 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.
*/
--
1.5.5.rc1.128.g340c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
