{"thread":{"id":"863","subject":"Re: [GIT PULL] ARM updates","startedAt":"2005-06-08T15:15:09Z","lastAt":"2005-06-08T16:06:17Z","messageCount":2,"participants":["Linus Torvalds","Russell King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"4701","messageId":"Pine.LNX.4.58.0506080802150.2286@ppc970.osdl.org","threadId":"863","inReplyTo":"20050608143549.GA7074@dyn-67.arm.linux.org.uk","subject":"Re: [GIT PULL] ARM updates","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-06-08T15:15:09Z","receivedAt":"2005-06-08T15:15:09Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Wed, 8 Jun 2005, Russell King wrote:\n> \n> Please incorporate the latest ARM changes, which can be found at:\n> \n> \tmaster.kernel.org:/home/rmk/linux-2.6-arm.git\n\nHeh, this one showed a problem with some git-apply sanity checks (I use \n\"git-apply --stat\" to generate the diffstat). \n\nIn particular:\n\n> This will update the following files:\n> \n>  arch/arm/mm/minicache.c                |   73 ------------------\n\nYou didn't actually delete the file, you made it be zero-sized. Which made \nthe patch header be\n\n  diff --git a/arch/arm/mm/minicache.c b/arch/arm/mm/minicache.c\n  --- a/arch/arm/mm/minicache.c\n  +++ b/arch/arm/mm/minicache.c\n  @@ -1,73 +0,0 @@\n  ...\n\nand git-apply complains about the fact that the patch deletes the file,\nbut the file still exists (it can tell both from this: it sees that this\nis not a \"delete\" event, since a \"diff --git\" would have had a \"delete\"\nheader line in it, but it also sees that it's a delete because the patch\nhas no result lines, ie the final \"+0,0\" means that there was nothing\nleft).\n\nNow, git-apply shouldn't actually care _that_ deeply in general, but the \nreason I added that check was exactly because in Linux, I actually want \nzero-sized files to not exist, and it turns out that git-apply did catch \nit..\n\nAnyway, I've made git-apply warn in a nice way (instead of claiming the \npatch is corrupt and exiting), but it did point out that you left \nminixache.c empty, not deleted.\n\nIn contrast, the \"copypage-xscale.S\" file really _was_ deleted by your \nchanges, not just made empty.\n\nRussell, do you know why you sometimes generate empty files, and sometimes \ndelete them? If you use \"patch\", add the \"-E\" flag to it..\n\n\t\tLinus\n"},{"id":"4707","messageId":"20050608170617.B28042@flint.arm.linux.org.uk","threadId":"863","inReplyTo":"Pine.LNX.4.58.0506080802150.2286@ppc970.osdl.org","subject":"Re: [GIT PULL] ARM updates","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-06-08T16:06:17Z","receivedAt":"2005-06-08T16:06:17Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Wed, Jun 08, 2005 at 08:15:09AM -0700, Linus Torvalds wrote:\n> \n> \n> On Wed, 8 Jun 2005, Russell King wrote:\n> > \n> > Please incorporate the latest ARM changes, which can be found at:\n> > \n> > \tmaster.kernel.org:/home/rmk/linux-2.6-arm.git\n> \n> Heh, this one showed a problem with some git-apply sanity checks (I use \n> \"git-apply --stat\" to generate the diffstat). \n> \n> In particular:\n> \n> > This will update the following files:\n> > \n> >  arch/arm/mm/minicache.c                |   73 ------------------\n> \n> You didn't actually delete the file, you made it be zero-sized. Which made \n> the patch header be\n> \n>   diff --git a/arch/arm/mm/minicache.c b/arch/arm/mm/minicache.c\n>   --- a/arch/arm/mm/minicache.c\n>   +++ b/arch/arm/mm/minicache.c\n>   @@ -1,73 +0,0 @@\n>   ...\n> \n> and git-apply complains about the fact that the patch deletes the file,\n> but the file still exists (it can tell both from this: it sees that this\n> is not a \"delete\" event, since a \"diff --git\" would have had a \"delete\"\n> header line in it, but it also sees that it's a delete because the patch\n> has no result lines, ie the final \"+0,0\" means that there was nothing\n> left).\n\nHey, it's my first time at using git directly rather than the currently\nbroken cogito - I had to do everything manually.  See my last message\nto the git mailing list.\n\n> In contrast, the \"copypage-xscale.S\" file really _was_ deleted by your \n> changes, not just made empty.\n\nThat's because I remembered that one was deleted.  This change was\nsomething which had been lingering for about a week while someone\ntested it, so of course I'd forget what was created and removed by\nit.\n\n-- \nRussell King\n\n"}]}