git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Deleted file is back - how to investigate?

From
CKChristof Krüger <git@christof-krueger.de>
Date
Jun 26, 2011, 14:10 UTC
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
Previous: Miklos VajnaNext: Miklos Vajna
Message 2 of 5 in “Deleted file is back - how to investigate?”
  1. Miklos VajnaJun 26, 2011
  2. Christof KrügerJun 26, 2011
  3. Miklos VajnaJun 26, 2011
  4. Andreas SchwabJun 26, 2011
  5. Christof KrügerJun 26, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.