Re: git remote update -> rejected

From: Jeff King <peff@peff.net>
Date: Apr 22, 2008, 12:56 UTC
Message-ID: <20080422125618.GA27577@sigill.intra.peff.net>
In-Reply-To: <alpine.DEB.1.00.0804221250010.4460@eeepc-johanness>

Mike wrote:

> > > Thanks a bunch.  I'll try it.  I notice that origin and linux-next
> > > already had + prefix.  Presumably that came from the home repo.

Dscho wrote:

Show 9 quoted lines

> It was a concious decision, but maybe it was wrong.
> 
> My rationale was this: if I mirror another person's repository, I want all 
> the history.  And I do want to keep it, even if the other person decides 
> to clean the original repository out.
>
> (In this case, the reflogs would not help, since I do not have a HEAD 
> reflog for all the deleted branches, and deleting the refs deletes their 
> reflogs, too.)

Hmm, there is an inconsistency here, though, since we set it up one way on clone and another way on "remote add". Though if clone does finally become "init + remote add + checkout" that will resolve itself.

Still, I think I prefer the old "+" behavior. We don't actually _delete_ branches, we just allow non-fast-forward updates. The reflogs will still be there.

-Peff