Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751519AbZGPEBJ (ORCPT ); Thu, 16 Jul 2009 00:01:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750803AbZGPEBI (ORCPT ); Thu, 16 Jul 2009 00:01:08 -0400 Received: from srv5.dvmed.net ([207.36.208.214]:43087 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbZGPEBH (ORCPT ); Thu, 16 Jul 2009 00:01:07 -0400 Message-ID: <4A5EA598.5050801@garzik.org> Date: Wed, 15 Jul 2009 23:59:20 -0400 From: Jeff Garzik User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Junio C Hamano CC: git@vger.kernel.org, LKML Subject: Re: [ANNOUNCE] GIT 1.6.4.rc1 References: <7vmy75bg2f.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vmy75bg2f.fsf@alter.siamese.dyndns.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.2.5 on srv5.dvmed.net summary: Content analysis details: (-4.4 points, 5.0 required) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2341 Lines: 57 Junio C Hamano wrote: > GIT v1.6.4 Release Notes (draft) > ================================ > > With the next major release, "git push" into a branch that is > currently checked out will be refused by default. You can choose > what should happen upon such a push by setting the configuration > variable receive.denyCurrentBranch in the receiving repository. > > To ease the transition plan, the receiving repository of such a > push running this release will issue a big warning when the > configuration variable is missing. Please refer to: > > http://git.or.cz/gitwiki/GitFaq#non-bare > http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 > > for more details on the reason why this change is needed and the > transition plan. > > For a similar reason, "git push $there :$killed" to delete the branch > $killed in a remote repository $there, if $killed branch is the current > branch pointed at by its HEAD, gets a large warning. You can choose what > should happen upon such a push by setting the configuration variable > receive.denyDeleteCurrent in the receiving repository. > > When the user does not tell "git push" what to push, it has always > pushed matching refs. For some people it is unexpected, and a new > configuration variable push.default has been introduced to allow > changing a different default behaviour. To advertise the new feature, > a big warning is issued if this is not configured and a git push without > arguments is attempted. > > Side note: we might want to tone this down, as it does not seem > likely for us to change the default behaviour when this option is > not set. Is there some sort of guide to the new best practices for handling trees such as git.kernel.org, where one pushes into "foo.git" directly, and there is no checked-out source code at all? I've been getting the multi-line "warning: Updating the currently checked out branch may cause confusion" message, but ignoring it for now, because it does not appear to apply to my situation (no checked-out work tree). Advice appreciated... Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/