git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: git bug?
Date: Thu, 09 Jun 2005 01:15:41 -0700	[thread overview]
Message-ID: <7vmzq0osia.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <42A7F769.2050800@pobox.com> (Jeff Garzik's message of "Thu, 09 Jun 2005 04:01:45 -0400")

>>>>> "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



  reply	other threads:[~2005-06-09  8:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-09  6:54 git bug? Jeff Garzik
2005-06-09  7:39 ` Jeff Garzik
     [not found] ` <7vy89kq96o.fsf@assigned-by-dhcp.cox.net>
2005-06-09  7:55   ` Junio C Hamano
2005-06-09  8:01     ` Jeff Garzik
2005-06-09  8:15       ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-26 17:57 PANEL Christian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vmzq0osia.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=jgarzik@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).