From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755781AbXGBOhz (ORCPT ); Mon, 2 Jul 2007 10:37:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755771AbXGBOhf (ORCPT ); Mon, 2 Jul 2007 10:37:35 -0400 Received: from fiberbit.xs4all.nl ([213.84.224.214]:58005 "EHLO fiberbit.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182AbXGBOhc (ORCPT ); Mon, 2 Jul 2007 10:37:32 -0400 X-Greylist: delayed 776 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Jul 2007 10:37:32 EDT Date: Mon, 2 Jul 2007 16:24:30 +0200 From: Marco Roeland To: Jesper Juhl Cc: Jeff Garzik , "Robert P. J. Day" , Linux Kernel Mailing List , Git Mailing List , Linus Torvalds Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h? Message-ID: <20070702142430.GA10400@fiberbit.xs4all.nl> References: <4688EF9B.8020405@garzik.org> <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com> User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Monday July 2nd 2007 at 15:58 Jesper Juhl wrote: > [obnoxious zero sized file include/asm-blackfin/macros.h that gets > zapped by toolchains and resurrected again by git] > > I've seen that as well, but in my case doing a > $ git reset --hard master > fixed it. Dangerous, as it may overwrite local changes you have! A simple "git checkout include/asm-blackfin/macros.h" is much safer in this case. In git commit df30b11 this file got redundant. Perhaps because a normal patch was applied, instead of with git, the file didn't get deleted from the repository but truncated to size zero. Not strictly wrong perse, but for the Linux repository highly unusual (and the only one at that). Your toolchain perhaps deletes files with zero size after cleaning up or something. Git then notices that you deleted this file. Perhaps someone can apply something like the following to finally fix this up: commit 7d98740800f3d9ad2428afa8c677be9573a51b7b Author: Marco Roeland Date: Mon Jul 2 16:19:49 2007 +0200 Blackfin arch: remove zero-sized include/asm-blackfin/macros.h This file accidentally got truncated instead of deleted in commit df30b11. Signed-off-by: Marco Roeland diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h deleted file mode 100644 index e69de29..0000000