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

Hi,

In this particular case, it seems that the offending commit is indeed a
merge commit (a5f45ee4). But it rather looks like user error and not a
git bug to me.  When I checkout its first parent (a5e830ee) and merge
its second parent (93b01c6c) myself, I get some conflicts, but the
ogle-gui file stays deleted.

As to how to detect what pulled the file back in:
I added --graph to your command line which implies parent rewriting.
This includes merges and should give you some information about the
"topology" of the history graph, leaving out irrelevant commits
in-between.  I wouldn't call myself a history simplification exptert, so
there might still be cases where this does not help, but in this case it
indeed shows the offending merge commit.

Regards,
  Chris

  reply	other threads:[~2011-06-26 14:10 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 [this message]
2011-06-26 20:25   ` Miklos Vajna
2011-06-26 20:57     ` Andreas Schwab
2011-06-26 21:12     ` Christof Krüger

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=1309097423.11860.76.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