{"thread":{"id":"5674","subject":"Re: 2.6.18-mm1","startedAt":"2006-09-24T16:55:15Z","lastAt":"2006-09-24T16:55:15Z","messageCount":1,"participants":["Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"27559","messageId":"20060924165515.GX13132@pasky.or.cz","threadId":"5674","inReplyTo":"20060924144710.GG25666@flint.arm.linux.org.uk","subject":"Re: 2.6.18-mm1","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-09-24T16:55:15Z","receivedAt":"2006-09-24T16:55:15Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Sep 24, 2006 at 04:47:10PM CEST, I got a letter\nwhere Russell King <rmk+lkml@arm.linux.org.uk> said that...\n> On Sun, Sep 24, 2006 at 04:29:58PM +0200, Petr Baudis wrote:\n> > Dear diary, on Sun, Sep 24, 2006 at 04:20:06PM CEST, I got a letter\n> > where Russell King <rmk+lkml@arm.linux.org.uk> said that...\n> > > I'm now told that the resulting tree after all the commits is correct.\n> > > The problem is that all the files which were supposed to be deleted by\n> > > previous patches ended up actually being deleted by the final patch in\n> > > the series.\n> > > \n> > > So the resulting tree is fine, it's just that the history is rather\n> > > broken.\n> > \n> > Well, that rewritehist batch should work fine even in this case.\n> > \n> > (Of course that's assuming that no change was supposed to happen to\n> > those files in the last four days.)\n> > \n> > > I think a solution to this might be to use git-apply, but there's one\n> > > draw back - I currently have the facility to unpatch at a later date,\n> > > but git-apply doesn't support -R.\n> > \n> > Yes, if there's not too many patches perhaps using git-apply -R would be\n> > simpler. git-apply in git-1.4.2.1 does support -R.\n> \n> I'm just experimenting with git-apply for the forward case, and I'm\n> hitting a small problem.  I can do:\n> \n> \tcat patch | git-apply --stat\n> \n> then I come to commit it:\n> \n> \tgit commit -F -\n> \n> but if I just use that, _all_ changes which happen to be in the tree\n> get committed, not just those which are in the index file.  Manually\n> doing each step of the commit is far too much work in perl...\n\nHmm, I'm sorry but I'm not all that well-versed in git commit inner\nworkings. The best way to get help is to cc' git@vger.kernel.org.\n\nAccording to git-commit documentation, when you do what you wrote you\nuse, it _should_ commit just the index file...\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\n#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj\n$/=unpack('H*',$_);$_=`echo 16dio\\U$k\"SK$/SM$n\\EsN0p[lN*1\nlK[d2%Sa2/d0$^Ixp\"|dc`;s/\\W//g;$_=pack('H*',/((..)*)$/)\n"}]}