From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jeff King <peff@peff.net>
Cc: Graham Perks <gperks@ausperks.net>, Git List <git@vger.kernel.org>
Subject: Re: Am able to delete a file with no trace in the log
Date: Tue, 2 Jun 2009 14:55:24 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0906021439030.4880@localhost.localdomain> (raw)
In-Reply-To: <20090602213439.GA7584@coredump.intra.peff.net>
On Tue, 2 Jun 2009, Jeff King wrote:
>
> But it doesn't show up in "git log". I believe this is because the rule
> for what to show in a merge commit is "if content is exactly the same as
> one of the parents, it's not interesting".
Correct.
What happens is that "git log" with a filename will always simplify the
history to the side that matches. And yes, "matching" can and does include
"doesn't exist in child, doesn't exist in parent"
Now, I admit that in this case the matching heuristic is dubious, and
maybe we should consider "does not exist in result" to not match any
parent. We already think that "all new" is special ("REV_TREE_NEW" vs
"REV_TREE_DIFFERENT"), so maybe we should think that "all deleted" is also
special ("REV_TREE_DEL")
Linus
next prev parent reply other threads:[~2009-06-02 21:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-02 19:33 Am able to delete a file with no trace in the log Graham Perks
2009-06-02 20:29 ` Tony Finch
2009-06-02 21:34 ` Jeff King
2009-06-02 21:55 ` Linus Torvalds [this message]
2009-06-03 0:47 ` Sitaram Chamarty
2009-06-03 1:20 ` Linus Torvalds
2009-06-03 1:34 ` Clean up and simplify rev_compare_tree() Linus Torvalds
2009-06-03 1:57 ` Am able to delete a file with no trace in the log Junio C Hamano
2009-06-03 3:03 ` Linus Torvalds
2009-06-03 21:18 ` Junio C Hamano
2009-06-03 21:26 ` Linus Torvalds
2009-06-03 21:33 ` Linus Torvalds
2009-06-03 21:59 ` Avery Pennarun
2009-06-03 22:02 ` Junio C Hamano
2009-06-03 22:17 ` Linus Torvalds
2009-06-03 22:38 ` Junio C Hamano
2009-06-03 22:44 ` Jeff King
2009-06-03 22:56 ` Linus Torvalds
2009-06-03 23:06 ` Jeff King
2009-06-03 23:27 ` Linus Torvalds
2009-06-03 23:37 ` Jeff King
2009-06-04 1:58 ` Linus Torvalds
2009-06-04 6:57 ` Junio C Hamano
2009-06-03 22:47 ` Linus Torvalds
2009-06-03 22:56 ` Junio C Hamano
2009-06-03 21:55 ` Junio C Hamano
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=alpine.LFD.2.01.0906021439030.4880@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gperks@ausperks.net \
--cc=peff@peff.net \
/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).