Re: git bug?
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jun 9, 2005, 08:15 UTC
- Message-ID
- <7vmzq0osia.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <42A7F769.2050800@pobox.com>
>>>>> "JG" == Jeff Garzik <jgarzik@pobox.com> writes:
JG> 'git-diff-cache -p HEAD' should not show files that I have not modified. JG> This screws up JG> git-diff-cache -p HEAD | diffstat -p1 | awk '{print $1}' JG> for example.
Agreed 100%. If there is a file exists (rather, if the git thinks the file is there), then diff-cache should not say it is deleted. That would be wrong.
Sorry for not having a crystal ball to poke into your terminal, so let me get something straight. I am still unsure the problem you are reporting is coming from diff-cache bug, or somehow yesterday's (well it is 01:13AM where I sit ;-)) merge updates trashed your work tree or index file, so these questions would help me tell which. When "diff-cache" reports the file "deleted":
- Do you have that arch/arm/mm/minicache.c file in your working directory?
- Does git-ls-files know about the file? Does the path show in: git-ls-files --stage | grep arch/arm/mm/minicache.c
- Does the HEAD tree have the path as well? Does it show in: git-ls-tree -r HEAD | grep arch/arm/mm/minicache.c