Re: Overwriting bare repositories' master

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 29, 2006, 22:43 UTC
Message-ID: <Pine.LNX.4.63.0610292338300.26682@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vslh6zstt.fsf@assigned-by-dhcp.cox.net>

Hi,

On Sun, 29 Oct 2006, Junio C Hamano wrote:

Show 27 quoted lines

> Sylvain Beucler <beuc@gnu.org> writes:
> 
> > I tried and I found something that doesn't seem to follow the
> > documentation:
> >
> > [...]
> > error: denying non-fast forward; you should pull first
> >
> > From man git-push:
> > "If the optional plus + is used, the remote ref is updated even if it
> > does not result in a fast forward update."
> >
> > [...]
> >
> > Is this by design? Or should it work?
> 
> I suspect (because I cannot see your .git/config in the
> repository; which would say "[core] sharedrepository = 1" if my
> suspicion is correct) that this is fairly new heavyhanded safety
> valve added by the list around mid September, with this:
> 
>     commit 11031d7e9f34f6a20ff4a4bd4fa3e5e3c0024a57
>     Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>     Date:   Thu Sep 21 01:07:54 2006 +0200
> 
>         add receive.denyNonFastforwards config variable
> [...]

I still think the forced updates of pu still lose too many useful bits in git's history.

Having said that, if receive.denyNonFastforwards indeed is the culprit: git-shell allows you to do something like this:

	ssh user@git.gnu.org \
	  "git-repo-config --unset receive.denyNonFastforwards"

After that, forced pushes should succeed. By the same account,

	ssh user@git.gnu.org \
	  "git-repo-config --bool receive.denyNonFastforwards"

should tell you if Junio's suggestion is right (in this case, it will output "true").

Hth, Dscho