2009/6/9 Santi Béjar <santi@xxxxxxxxxxx>: > 2009/6/9 Santi Béjar <santi@xxxxxxxxxxx>: >> 2009/6/9 Junio C Hamano <gitster@xxxxxxxxx>: >>> Santi Béjar <santi@xxxxxxxxxxx> writes: >>> >>>>> git pull --rebase tags v1.6.0 >>>> >>>> In fact: git pull --rebase remote tags v1.6.0 >>>> >>>> But this still works because oldremoteref defaults to defaults_merge. >>>> So the only behavior change is when a remote branch is >>>> rebased/retagged, and you have worst problems then. I think noone used >>>> the rebased functionality in this way, so I don't think it is worth to >>>> support it. But if someone think it is important I'll do it. >>> >>> I personally do not think supporting such a form of input is absolutely >>> necessary. Even though technically it might be a regression, if it is so >>> rare a form, we can simply say "this strange form used to work, but now it >>> does not; you can use this form instead to do the same thing", and move >>> on. >> >> OK. >> > > At the end it was a little patch to get this corner case working. Here > it is the patch to squash (I'll send later a proper patch mail, with a > test). > > And this additional sentence in the commit log: > > No behavior changes. The new function behaves like the old code used in > "git pull --rebase". > At the end the original code does not handle this case, as it asumes that the rebase ref is a remote commit in refs/remotes/$origin/$ref. So the new code behaves exactly like the old one. I'll send all again with an updated commit message explaining all this. Santi -- 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