On Thu, 14 Jun 2007, Junio C Hamano wrote:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
> > Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:
> >
> >> I *suspect* it's due to the refspec pattern matching changes Daniel did,
> >> but again - I haven't actually debugged it any deeper.
> >
> > I am officially recuperating from an operation I had today, so I
> > cannot really take a deep look at this.
> >
> > I think what is going wrong is that struct refspec for pattern
> > match that is parsed by parse_ref_spec does not have ->dst
> > component filled for "refs/tags/*" refspec, but match_refs()
> > does not check if pat->dst is NULL, in which case it should
> > reuse pat->src value.
> >
> > Incidentally I have other remote.c fixes queued in 'next'. I
> > haven't yet checked if I (accidentally) fixed this already.
>
> Completely untested, but this may fix it.
>
> I suspect this has an side effect of allowing
>
> fetch = refs/heads/*
>
> to mean the same thing as
>
> fetch = refs/heads/*:refs/heads/*
>
> which is suitable for a bare mirroring repository, but I do not
> think of any downside, so it might be Ok.
>
> But that is something from a person who was under anesthesia a
> few hours ago, so you should take it with a big grain of salt ;-)
Yeah, that's not right; "push = refs/heads/*" works like that, but
"fetch = refs/heads/*" puts them in MERGE_HEAD without storing them
anywhere, unlike "fetch = refs/heads/*:refs/heads/*". That's why I didn't
just copy the left side to the right side, which is what the old parsing
code did: what you're going to do with the refspec determines how you
interpret a missing rhs. So it needs to be the code that uses the refspec
that handles this case.
Your analysis of the failure was right, though. I reproduced it, and this
fixes it for me:
--- cut here ---
Author: Daniel Barkalow <barkalow@xxxxxxxxxxxx>
Date: Fri Jun 15 10:22:37 2007 -0400
Fix pushing to a pattern with no dst
Refspecs with no colons are left with no dst value, because they are
interepreted differently for fetch and push. For push, they mean to
reuse the src side. Fix this for patterns.
Signed-off-by: Daniel Barkalow <barkalow@xxxxxxxxxxxx>
diff --git a/remote.c b/remote.c
index 6121416..c860740 100644
--- a/remote.c
+++ b/remote.c
@@ -546,10 +546,11 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
}
if (pat) {
- dst_name = xmalloc(strlen(pat->dst) +
+ const char *dst_side = pat->dst ? pat->dst : pat->src;
+ dst_name = xmalloc(strlen(dst_side) +
strlen(src->name) -
strlen(pat->src) + 2);
- strcpy(dst_name, pat->dst);
+ strcpy(dst_name, dst_side);
strcat(dst_name, src->name + strlen(pat->src));
} else
dst_name = xstrdup(src->name);
-
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
