Re: why does git perpetually complain about include/asm-blackfin/macros.h?

From: Jeff Garzik <jeff@garzik.org>
Date: Jul 2, 2007, 14:10 UTC
Message-ID: <4689073D.1020802@garzik.org>
In-Reply-To: <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com>

Jesper Juhl wrote:

Show 18 quoted lines

> On 02/07/07, Jeff Garzik <jeff@garzik.org> 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.

	Jeff