On 2013-03-04 11:33:49 -0300, Alvaro Herrera wrote:
> Andres Freund wrote:
>
> > I think the most realistic way to resolve this is to push the current
> > anongit state to master and cherry-pick
> > bc61878682051678ade5f59da7bfd90ab72ce13b ontop it. That way only
> > committers need to deal with rebasing their branches and not everyone
> > else.
>
> I agree this seems the sanest course of action, but I think it would be
> better to install defenses in the master repo so that forced pushes are
> no longer allowed *before* rebasing gitmaster; otherwise some other
> committer could clobber things again if they don't force-pull their
> trees.
Its just receive.denyNonFastForwards that needs to be set to true for
that, so it should be simple enouh.
> FWIW I also use a bare mirror (same setup as Kevin).
I think that setup is fine as far as pulling goes, but you should push
directly from the individual branches.
Greetings,
Andres Freund
-- Andres Freund http://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Training &
Services