From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 30 Jan 2009 13:28:39 GMT
Subject: Re: [PATCH] Switch receive.denyCurrentBranch to "refuse"
Message-ID: <alpine.DEB.1.00.0901301426150.3586@pacific.mpi-cbg.de>
In-Reply-To: <20090130023040.GR21473@genesis.frugalware.org>

Hi,

On Fri, 30 Jan 2009, Miklos Vajna wrote:

> On Fri, Jan 30, 2009 at 01:34:28AM +0100, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
> > -		error("refusing to update checked out branch: %s", name);
> > +		error("refusing to update checked out branch: %s\n"
> > +			"if you know what you are doing, you can allow it by "
> > +			"setting\n\n"
> > +			"\tgit config receive.denyCurrentBranch true\n", name);
> 
> Shouldn't this be
> 
> git config receive.denyCurrentBranch ignore
> 
> instead of "true"?

Right.

However, as Junio pointed out, we do not want to give this resolution in 
the error message.  I am now leaning more to something like

	refusing to update checked out branch '%s' in non-bare repository

Hmm?

Old-timers will know "oh, what the hell, I did not mark my repository as 
bare!", and new-timers will no longer be confused.

Ciao,
Dscho