From: Ralf Baechle <ralf@linux-mips.org>
To: Chris Dearman <chris@mips.com>
Cc: Shinya Kuribayashi <shinya.kuribayashi@necel.com>,
yuasa@linux-mips.org, linux-mips@linux-mips.org,
git@vger.kernel.org
Subject: Re: What's happening with vr41xx_giu.c?
Date: Fri, 10 Jul 2009 11:47:43 +0100 [thread overview]
Message-ID: <20090710104743.GB1288@linux-mips.org> (raw)
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.
> 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
next parent reply other threads:[~2009-07-10 10:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4A5680B5.2090405@necel.com>
[not found] ` <4A56B060.7090106@mips.com>
2009-07-10 10:47 ` Ralf Baechle [this message]
2009-07-10 16:20 ` What's happening with vr41xx_giu.c? Junio C Hamano
2009-07-11 3:14 ` Junio C Hamano
2009-07-11 3:20 ` [PATCH 1/2] tm_to_time_t(): allow times in year 1969 Junio C Hamano
2009-07-11 3:20 ` [PATCH 2/2] apply: notice creation/removal patches produced by GNU diff Junio C Hamano
2009-07-11 3:32 ` Linus Torvalds
2009-07-11 3:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090710104743.GB1288@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=chris@mips.com \
--cc=git@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=shinya.kuribayashi@necel.com \
--cc=yuasa@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).