From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: linux-next: unneeded merge in the security tree Date: Tue, 12 Mar 2013 14:30:04 -0700 Message-ID: <7vtxog5msj.fsf@alter.siamese.dyndns.org> References: <20130312100950.e45ef0e721492ff0d5fd7c8d@canb.auug.org.au> <20130312041641.GE18595@thunk.org> <20130312212027.GE14792@thunk.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:43565 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932707Ab3CLVaH (ORCPT ); Tue, 12 Mar 2013 17:30:07 -0400 In-Reply-To: <20130312212027.GE14792@thunk.org> (Theodore Ts'o's message of "Tue, 12 Mar 2013 17:20:27 -0400") Sender: linux-next-owner@vger.kernel.org List-ID: To: Theodore Ts'o Cc: Linus Torvalds , James Morris , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Git Mailing List Theodore Ts'o writes: > What if we added the ability to do something like this: > > [remote "origin"] > url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > fetch = +refs/heads/master:refs/heads/master > mergeoptions = --ff-only > > This would be an analog to branch..mergeoptions, but it would > apply to the source of the pull request, instead of the destination. > > That way, people who do a "git pull" from Linus's tree would get the > protection of --ff-only, while pulls from submaintainer trees would > automatically get a merge commit, which is what we want. > > It doesn't handle the case of a submaintainer pulling from a > maintainer in a back-merge scenario, but that should be a pretty rare > case, so maybe that's OK. Is there an escape hatch for that rare case? IOW, how does a submaintainer who configured the above to override --ff-only?