lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 2 Jul 2007 16:22:07 +0200 From: "Alex Riesen" <raa.lkml@...il.com> To: "Jeff Garzik" <jeff@...zik.org> Cc: "Jesper Juhl" <jesper.juhl@...il.com>, "Robert P. J. Day" <rpjday@...dspring.com>, "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>, "Git Mailing List" <git@...r.kernel.org>, "Linus Torvalds" <torvalds@...ux-foundation.org> Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h? On 7/2/07, Jeff Garzik <jeff@...zik.org> wrote: > Jesper Juhl wrote: > > On 02/07/07, Jeff Garzik <jeff@...zik.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. > 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 linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists