From: Jeff King <peff@peff.net>
Date: Tue, 29 Jun 2010 22:39:19 GMT
Subject: Re: origin/branchname and tracking branch pointing to different commits?
Message-ID: <20100629223919.GB5668@sigill.intra.peff.net>
In-Reply-To: <7vocet8ws2.fsf@alter.siamese.dyndns.org>

On Tue, Jun 29, 2010 at 12:27:09PM -0700, Junio C Hamano wrote:

> I have a slight suspicion that such an "unexpected ref update" is not a
> big issue anymore.  So in principle, I think it is fine to change the
> behaviour of "git fetch $there $these_explicit_refs" to additionally
> follow the configured remote tracking ref globbing patterns.
> 
> Because
> 
>  (1) the old patch was never tested in a production context (I don't think
>      it even hit 'pu');
> 
>  (2) I offhand do not know how much the codebase changed in the area that
>      would affect the assumptions the patch made back then; and
> 
>  (3) we will be in feature freeze for 1.7.2 anyway;
> 
> I would rather not be the one who is forward-porting the patch myself
> if I can avoid it, however.

I am probably the best person to take another look at it (though I would
be fine if somebody else wants to volunteer).

Right now I am in the process of switching day jobs and doing an
inter-state move, so it will probably be a month before I have a lot of
git time.

-Peff