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 13:02:19 -0700 Message-ID: <7vobeo75f8.fsf@alter.siamese.dyndns.org> References: <20130312100950.e45ef0e721492ff0d5fd7c8d@canb.auug.org.au> <20130312041641.GE18595@thunk.org> <7vsj40760d.fsf@alter.siamese.dyndns.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]:42864 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755533Ab3CLUCW (ORCPT ); Tue, 12 Mar 2013 16:02:22 -0400 In-Reply-To: <7vsj40760d.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 12 Mar 2013 12:49:38 -0700") Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Torvalds Cc: Theodore Ts'o , James Morris , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Git Mailing List Junio C Hamano writes: > Then under the "--no-ff activates the magic" rule: > > git merge v3.9-rc2 > > will fast-forward, but this > > git merge --no-ff v3.9-rc2 > > creates a real merge with the "mergetag" signature block. The one > that caused trouble in the "security tree", i.e. > > git pull linus v3.9-rc2 > > or its equivalent > > git fetch linus v3.9-rc2 > git merge FETCH_HEAD > > would still fast-forward under this rule. The maintainer needs to > do > > git pull --no-ff git://git.kernel.org/... for-linus > > if the pull could fast-forward under this rule, though. Scratch the last sentence. It should have been "whether the pull fast-forwards or not". You'd always need to.