On Mon, 2007-07-02 at 16:24 +0200, Marco Roeland wrote: > 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 <[EMAIL PROTECTED]> > 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 <[EMAIL PROTECTED]> > > diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h > deleted file mode 100644 > index e69de29..0000000 > -
Thanks, Applied to the blackfin-2.6.git tree for Linus pull. - Bryan > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
