Thread (14 messages) read the whole thread 14 messages, 8 authors, 2007-07-14

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

From: Jeff Garzik <hidden>
Date: 2007-07-02 14:10:31
Also in: lkml

Jesper Juhl wrote:
On 02/07/07, Jeff Garzik [off-list ref] wrote:
quoted
Robert P. J. Day wrote:
quoted
  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
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help