From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932168AbVJ3Moe (ORCPT ); Sun, 30 Oct 2005 07:44:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932169AbVJ3Moe (ORCPT ); Sun, 30 Oct 2005 07:44:34 -0500 Received: from dsl092-053-140.phl1.dsl.speakeasy.net ([66.92.53.140]:65472 "EHLO grelber.thyrsus.com") by vger.kernel.org with ESMTP id S932168AbVJ3Mod (ORCPT ); Sun, 30 Oct 2005 07:44:33 -0500 From: Rob Landley Organization: Boundaries Unlimited To: Linus Torvalds Subject: Re: [git patches] 2.6.x libata updates Date: Sun, 30 Oct 2005 06:44:19 -0600 User-Agent: KMail/1.8 Cc: Jeff Garzik , Andrew Morton , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org References: <20051029182228.GA14495@havoc.gtf.org> <4363CB60.2000201@pobox.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200510300644.20225.rob@landley.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Saturday 29 October 2005 14:37, Linus Torvalds wrote: > Now, I've gotten several positive comments on how easy "git bisect" is to > use, and I've used it myself, but this is the first time that patch users > _really_ become very much second-class citizens, and you can't necessarily > always do useful things with just the tar-trees and patches. That's sad, > and possibly a really big downside. > > Don't get me wrong - I personally think that the new merge policy is a > clear improvement, but it does have this downside. One possible solution: Rather than making the patch a simple diff of the trees, make the patch a cat of the individual patches/commits (preferably with descriptions) that got applied, in the order they got applied. This makes the patch bigger, but it also means that bisect can be done with vi, simply by truncating the file at the last interesting patch and applying the truncated version to a clean tree. Since patch applies hunks in order and sifts out hunks from description already... Is this a viable option? Rob