From: Robert P. J. Day Date: Mon, 02 Jul 2007 14:22:05 GMT Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h? Message-ID: In-Reply-To: <4689073D.1020802@garzik.org> On Mon, 2 Jul 2007, Jeff Garzik wrote: > Jesper Juhl wrote: > > On 02/07/07, Jeff Garzik wrote: > > > Robert P. J. Day wrote: > > > > for the umpteenth time, after doing a pull, i see this: > > > > > > > > $ git diff > > > > diff --git a/include/asm-blackfin/macros.h > > > b/include/asm-blackfin/macros.h > > > > deleted file mode 100644 > > > > index e69de29..0000000 > > > > $ > > > > > > I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6. > > > > > > I even tried a completely fresh clone, but the problem still appears. > > > > > I've seen that as well, but in my case doing a > > $ git reset --hard master > > fixed it. > > Sure. git checkout -f fixes it too. > > But then it reappears the every time I switch branches. same here -- checkout fixes it, but back it comes after the next pull. not fatal -- just annoying. rday -- ======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry Waterloo, Ontario, CANADA http://fsdev.net/wiki/index.php?title=Main_Page ========================================================================