Git development
 help / color / mirror / Atom feed
From: "Christof Krüger" <git@christof-krueger.de>
To: git@vger.kernel.org
Cc: Miklos Vajna <vmiklos@frugalware.org>
Subject: Re: Deleted file is back - how to investigate?
Date: Sun, 26 Jun 2011 23:12:24 +0200	[thread overview]
Message-ID: <1309122744.11860.121.camel@oxylap> (raw)
In-Reply-To: <20110626202532.GS30255@genesis.frugalware.org>

On So, 2011-06-26 at 22:25 +0200, Miklos Vajna wrote:
> Hi Chris,
> 
> Great, --graph indeed lists two merge commits, and if I check the tree
> objects manually, I can see which one introduced the file. But I still
> don't really understand --name-status why don't show the addition of
> those files, given that I hoped this counts as an "evil merge".

As I understand it, --name-status doesn't play any role in choosing the
commits that are interesting for the "git log <path>" command.

To speak in the terminology used in the history simplification section
of "man git":  What you want is to show all commits that are NOT
TREESAME to _at least_ one parent, whereas git gives you only commits
that are NOT TREESAME to ANY parent.
 
From my current understanding of history simplification, I don't see any
way to directly achieve this. The default mode does not include merge
commits if at least one parent is TREESAME. The --full-history option
only changes which parents are followed, but doesn't change whether a
merge is included or not. Parent rewriting unconditionally includes all
merges, even the ones that are TREESAME wrt all parents.

So do i conclude correctly, that this is a missing feature in git? Is
there something I have overlooked?

Regards,
  Chris

      parent reply	other threads:[~2011-06-26 21:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-26 10:32 Deleted file is back - how to investigate? Miklos Vajna
2011-06-26 14:10 ` Christof Krüger
2011-06-26 20:25   ` Miklos Vajna
2011-06-26 20:57     ` Andreas Schwab
2011-06-26 21:12     ` Christof Krüger [this message]

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

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

  git send-email \
    --in-reply-to=1309122744.11860.121.camel@oxylap \
    --to=git@christof-krueger.de \
    --cc=git@vger.kernel.org \
    --cc=vmiklos@frugalware.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox