From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186Ab1CLEJs (ORCPT ); Fri, 11 Mar 2011 23:09:48 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:57122 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053Ab1CLEJq (ORCPT ); Fri, 11 Mar 2011 23:09:46 -0500 X-Authority-Analysis: v=1.1 cv=3uSaImBeuprzHBlOOPjkqgu+7PcxSRW0m2Aphm9Zmck= c=1 sm=0 a=kj9zAlcOel0A:10 a=OPBmh+XkhLl+Enan7BmTLg==:17 a=iLlV7a5dDzqwLNsUqrsA:9 a=JRG15W0rwDucrXe4RSxMB0Mog-sA:4 a=CjuIK1q_8ugA:10 a=OPBmh+XkhLl+Enan7BmTLg==:117 X-Cloudmark-Score: 0 X-Originating-IP: 67.242.120.143 Date: Fri, 11 Mar 2011 23:09:41 -0500 From: Steven Rostedt To: "J. Bruce Fields" Cc: Ben Hutchings , David Miller , torvalds@linux-foundation.org, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT] Networking Message-ID: <20110312040941.GA15526@home.goodmis.org> References: <20110310.155556.48513201.davem@davemloft.net> <20110311204823.GB7906@fieldses.org> <20110311.130128.71121155.davem@davemloft.net> <1299878274.2814.8.camel@bwh-desktop> <20110311214209.GB9404@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110311214209.GB9404@fieldses.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 11, 2011 at 04:42:09PM -0500, J. Bruce Fields wrote: > > But assume you only did this in cases where the merge was trivial. > Would it be worth it, or would people be annoyed by the additional > branching? > I would be annoyed by it ;) It really is meaningless to do so, as all you are doing is documenting what commit caused this bug, and producing more problems by branching off of the broken commit. It wont matter till it is merged, but then if there are a lot of simple bug fixes, then you will have a lot of single merges of branches that fix those bugs. It's just better to say in the change log of the fix: "commit abcdef1234 foo: add bar" Broke this, and this fixes it. Having the broken commit SHA1 and description in the change log is just as helpful as having the bug commit being its parent. -- Steve