From: Christof Krüger <git@christof-krueger.de>
Date: Sun, 26 Jun 2011 14:10:23 GMT
Subject: Re: Deleted file is back - how to investigate?
Message-ID: <1309097423.11860.76.camel@oxylap>
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