From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ralf Baechle Subject: Re: What's happening with vr41xx_giu.c? Date: Fri, 10 Jul 2009 11:47:43 +0100 Message-ID: <20090710104743.GB1288@linux-mips.org> References: <4A5680B5.2090405@necel.com> <4A56B060.7090106@mips.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Shinya Kuribayashi , yuasa@linux-mips.org, linux-mips@linux-mips.org, git@vger.kernel.org To: Chris Dearman X-From: git-owner@vger.kernel.org Fri Jul 10 12:48:08 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MPDeC-0003Y9-2W for gcvg-git-2@gmane.org; Fri, 10 Jul 2009 12:48:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580AbZGJKr4 (ORCPT ); Fri, 10 Jul 2009 06:47:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751348AbZGJKr4 (ORCPT ); Fri, 10 Jul 2009 06:47:56 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:52173 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751382AbZGJKrz (ORCPT ); Fri, 10 Jul 2009 06:47:55 -0400 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n6AAliGS003400; Fri, 10 Jul 2009 11:47:44 +0100 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n6AAlhqw003398; Fri, 10 Jul 2009 11:47:43 +0100 Content-Disposition: inline In-Reply-To: <4A56B060.7090106@mips.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 ..." to update what will be committed) >> # (use "git checkout -- ..." 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