On 7/2/07, Jeff Garzik <jeff@xxxxxxxxxx> wrote:
Jesper Juhl wrote: > On 02/07/07, Jeff Garzik <jeff@xxxxxxxxxx> 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.
Do some of your branches miss the commit by which it was removed? (It was removed in df30b1171714bbf0e55ffe02138be4b8447e4235) Than it will reappear every time you switch to a branch which still has the file. It is somewhat unclear what "reappear" means, though: do you mean in your working directory (that's what I explained above) or do you mean: on the commit pointed by HEAD? In that second case I can only suspect that all your branches point at the same commit, which is just before the one the file was removed in... - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
