Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbWIXQzT (ORCPT ); Sun, 24 Sep 2006 12:55:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751146AbWIXQzS (ORCPT ); Sun, 24 Sep 2006 12:55:18 -0400 Received: from w241.dkm.cz ([62.24.88.241]:14484 "EHLO machine.or.cz") by vger.kernel.org with ESMTP id S1751134AbWIXQzR (ORCPT ); Sun, 24 Sep 2006 12:55:17 -0400 Date: Sun, 24 Sep 2006 18:55:15 +0200 From: Petr Baudis To: linux-kernel@vger.kernel.org Cc: git@vger.kernel.org Subject: Re: 2.6.18-mm1 Message-ID: <20060924165515.GX13132@pasky.or.cz> References: <20060924040215.8e6e7f1a.akpm@osdl.org> <20060924124647.GB25666@flint.arm.linux.org.uk> <20060924132213.GE11916@pasky.or.cz> <20060924142005.GF25666@flint.arm.linux.org.uk> <20060924142958.GU13132@pasky.or.cz> <20060924144710.GG25666@flint.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060924144710.GG25666@flint.arm.linux.org.uk> X-message-flag: Outlook : A program to spread viri, but it can do mail too. User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2329 Lines: 55 Dear diary, on Sun, Sep 24, 2006 at 04:47:10PM CEST, I got a letter where Russell King said that... > On Sun, Sep 24, 2006 at 04:29:58PM +0200, Petr Baudis wrote: > > Dear diary, on Sun, Sep 24, 2006 at 04:20:06PM CEST, I got a letter > > where Russell King said that... > > > I'm now told that the resulting tree after all the commits is correct. > > > The problem is that all the files which were supposed to be deleted by > > > previous patches ended up actually being deleted by the final patch in > > > the series. > > > > > > So the resulting tree is fine, it's just that the history is rather > > > broken. > > > > Well, that rewritehist batch should work fine even in this case. > > > > (Of course that's assuming that no change was supposed to happen to > > those files in the last four days.) > > > > > I think a solution to this might be to use git-apply, but there's one > > > draw back - I currently have the facility to unpatch at a later date, > > > but git-apply doesn't support -R. > > > > Yes, if there's not too many patches perhaps using git-apply -R would be > > simpler. git-apply in git-1.4.2.1 does support -R. > > I'm just experimenting with git-apply for the forward case, and I'm > hitting a small problem. I can do: > > cat patch | git-apply --stat > > then I come to commit it: > > git commit -F - > > but if I just use that, _all_ changes which happen to be in the tree > get committed, not just those which are in the index file. Manually > doing each step of the commit is far too much work in perl... Hmm, I'm sorry but I'm not all that well-versed in git commit inner workings. The best way to get help is to cc' git@vger.kernel.org. According to git-commit documentation, when you do what you wrote you use, it _should_ commit just the index file... -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ #!/bin/perl -sp0777i