From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Tue, 13 Jan 2009 22:07:30 GMT
Subject: Re: Removing options from build
Message-ID: <20090113220730.GF30404@atjola.homenet>
In-Reply-To: <1231884045.14181.36.camel@starfruit>

On 2009.01.13 14:00:45 -0800, R. Tyler Ballance wrote:
> On Tue, 2009-01-13 at 22:53 +0100, Thomas Rast wrote:
> > R. Tyler Ballance wrote:
> > > Besides a vigorous flogging, we're looking at other ways to prevent this
> > > sort of thing from happening again; the option we've settled on is to
> > > remove the "--force" flag from our internal build of v1.6.1
> > >
> > > I'm wondering if somebody could point me in the right direction to
> > > remove "--force" (safely) from the builtin-push.c and removing the
> > > "rebase" command (we've got no use for it, and would prefer it gone).
> > 
> > IMHO your update (or pre-receive) hook should just disallow
> > non-fast-forward updates.
> 
> Don't merges count as non-fast-forward updates? We generate merge
> commits with almost every merge, rarely do we actually have
> fast-forwards anymore (highly active repository)

No, merges are "fast-forward". In rev-list terms:

git rev-list new_head..old_head ==> Empty

IOW: No commits are lost by the push.

Merges only add commits to the history, they don't remove anything.

Björn