Re: What's happening with vr41xx_giu.c?

From: Ralf Baechle <ralf@linux-mips.org>
Date: Jul 10, 2009, 10:47 UTC
Message-ID: <20090710104743.GB1288@linux-mips.org>
In-Reply-To: <4A56B060.7090106@mips.com>

On Thu, Jul 09, 2009 at 08:07:12PM -0700, Chris Dearman wrote:

This is smelling like a git issue so I'm adding git@vger.kernel.org to cc list.

Show 27 quoted lines

> Shinya Kuribayashi wrote:
>
>> skuribay@ubuntu:linux.git$ make distclean
>> skuribay@ubuntu:linux.git$
>> skuribay@ubuntu:linux.git$
>> skuribay@ubuntu:linux.git$ git status
>> # On branch master
>> # Changed but not updated:
>> #   (use "git add/rm <file>..." to update what will be committed)
>> #   (use "git checkout -- <file>..." to discard changes in working  
>> directory)
>> #
>> #       deleted:    drivers/char/vr41xx_giu.c
>> #
>> no changes added to commit (use "git add" and/or "git commit -a")
>> skuribay@ubuntu:linux.git$
>>
>
> Commit 27fdd325dace4a1ebfa10e93ba6f3d25f25df674 turned  
> drivers/char/vr41xx_giu.c into an empty file instead of deleting it when  
> the file was moved to drivers/gpio
>
> "make distclean" deletes any 0 length .c files that it finds.
>
> Leaving drivers/char/vr41xx_giu.c as a zero length file may have been a  
> git bug but was probably just an oversight. I'll send a patch to clean  
> it up as a followup.

And issue is reproducable. When I go back to commit 27fdd325dace4a1ebfa10e93ba6f3d25f25df674^ and apply Yoichi's patch using git am or git apply this will leave a zero byte drivers/char/vr41xx_giu.c. Patch(1) otoh will remove that file as expected. The patch file Yoichi sent looks perfectly ok; here the headers of the vr41xx_giu.c bit:

[...] diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/drivers/char/vr41xx_giu.c linux/drivers/char/vr41xx_giu.c --- linux-orig/drivers/char/vr41xx_giu.c 2009-06-29 10:06:58.329177629 +0900 +++ linux/drivers/char/vr41xx_giu.c 1970-01-01 09:00:00.000000000 +0900

@@ -1,680 +0,0 @@
-/*
[...]

This is with git 1.6.0.6 (git-1.6.0.6-4.fc10.x86_64 from Fedora 10).

The patch is available at http://www.linux-mips.org/cgi-bin/extract-mesg.cgi?a=linux-mips&m=2009-06&i=20090629111105.9ff024bf.yyuasa%40linux.com
and the git tree in question is Linus' kernel tree available from
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.

  Ralf