# Re: [GIT PULL] ARM updates 2 messages from 2005-06-08 to 2005-06-08. Participants: Linus Torvalds, Russell King. Thread: https://gitlist.dev/t/863 ## Linus Torvalds, 2005-06-08 15:15 Subject: Re: [GIT PULL] ARM updates Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.58.0506080802150.2286%40ppc970.osdl.org In-Reply-To: <20050608143549.GA7074@dyn-67.arm.linux.org.uk> ``` On Wed, 8 Jun 2005, Russell King wrote: > > Please incorporate the latest ARM changes, which can be found at: > > master.kernel.org:/home/rmk/linux-2.6-arm.git Heh, this one showed a problem with some git-apply sanity checks (I use "git-apply --stat" to generate the diffstat). In particular: > This will update the following files: > > arch/arm/mm/minicache.c | 73 ------------------ You didn't actually delete the file, you made it be zero-sized. Which made the patch header be diff --git a/arch/arm/mm/minicache.c b/arch/arm/mm/minicache.c --- a/arch/arm/mm/minicache.c +++ b/arch/arm/mm/minicache.c @@ -1,73 +0,0 @@ ... and git-apply complains about the fact that the patch deletes the file, but the file still exists (it can tell both from this: it sees that this is not a "delete" event, since a "diff --git" would have had a "delete" header line in it, but it also sees that it's a delete because the patch has no result lines, ie the final "+0,0" means that there was nothing left). Now, git-apply shouldn't actually care _that_ deeply in general, but the reason I added that check was exactly because in Linux, I actually want zero-sized files to not exist, and it turns out that git-apply did catch it.. Anyway, I've made git-apply warn in a nice way (instead of claiming the patch is corrupt and exiting), but it did point out that you left minixache.c empty, not deleted. In contrast, the "copypage-xscale.S" file really _was_ deleted by your changes, not just made empty. Russell, do you know why you sometimes generate empty files, and sometimes delete them? If you use "patch", add the "-E" flag to it.. Linus ``` ## Russell King, 2005-06-08 16:06 Subject: Re: [GIT PULL] ARM updates Message-ID: <20050608170617.B28042@flint.arm.linux.org.uk> URL: https://gitlist.dev/e/20050608170617.B28042%40flint.arm.linux.org.uk In-Reply-To: ``` On Wed, Jun 08, 2005 at 08:15:09AM -0700, Linus Torvalds wrote: > > > On Wed, 8 Jun 2005, Russell King wrote: > > > > Please incorporate the latest ARM changes, which can be found at: > > > > master.kernel.org:/home/rmk/linux-2.6-arm.git > > Heh, this one showed a problem with some git-apply sanity checks (I use > "git-apply --stat" to generate the diffstat). > > In particular: > > > This will update the following files: > > > > arch/arm/mm/minicache.c | 73 ------------------ > > You didn't actually delete the file, you made it be zero-sized. Which made > the patch header be > > diff --git a/arch/arm/mm/minicache.c b/arch/arm/mm/minicache.c > --- a/arch/arm/mm/minicache.c > +++ b/arch/arm/mm/minicache.c > @@ -1,73 +0,0 @@ > ... > > and git-apply complains about the fact that the patch deletes the file, > but the file still exists (it can tell both from this: it sees that this > is not a "delete" event, since a "diff --git" would have had a "delete" > header line in it, but it also sees that it's a delete because the patch > has no result lines, ie the final "+0,0" means that there was nothing > left). Hey, it's my first time at using git directly rather than the currently broken cogito - I had to do everything manually. See my last message to the git mailing list. > In contrast, the "copypage-xscale.S" file really _was_ deleted by your > changes, not just made empty. That's because I remembered that one was deleted. This change was something which had been lingering for about a week while someone tested it, so of course I'd forget what was created and removed by it. -- Russell King ```