Re: Am able to delete a file with no trace in the log

On Wed, Jun 03, 2009 at 04:27:39PM -0700, Linus Torvalds wrote:

quoted

  rm b.txt && git add b.txt &&
  echo resolve >a.txt && git add a.txt &&
  git commit -m merged

This doesn't work at all for me.

Do

	git show HEAD:b.txt

and it still shows b.txt in the commit. You should have used

	git rm b.txt

rather than "git add b.txt" (or you use use "-u" or "-a" to git add).

Er, sorry, yeah, I botched the recipe (I initially used "git rm" by
itself, but it complains about "changes staged in the index", so I fixed
it up manually and then botched writing out the automated version).

But I see you figured out what I meant, so...

But you're right. Even when fixed, it does seem to need "--full-history" 
to stay around, and --simplify-merges is insufficient. Bug in merge 
simplification?

I don't even see it with --full-history. I get:

  $ git log -m --stat --oneline | head
  b1a38ec (from 2671fa7) merged
   a.txt |    2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)
  b1a38ec (from d0bac65) merged
   a.txt |    2 +-
   b.txt |    1 -
   2 files changed, 1 insertions(+), 2 deletions(-)

  $ git log -m --stat --oneline -- b.txt
  (no output)

  $ git log --simplify-merges -m --stat --oneline -- b.txt
  912ac84 other 1
   b.txt |    1 +
   1 files changed, 1 insertions(+), 0 deletions(-)

  $ git log --full-history -m --stat --oneline -- b.txt
  912ac84 other 1
   b.txt |    1 +
   1 files changed, 1 insertions(+), 0 deletions(-)

Is there some trick to enabling both path limiting _and_ still showing
the merge commit? Or is this a bug?

-Peff