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

Re: commit gone after merge - how to debug?

From
ILIgor Lautar <igor.lautar@gmail.com>
Date
Nov 26, 2012, 14:15 UTC
Message-ID
<CAO1Khk9Y_SC8q4iHnv848Z+dXMaeUOWxzW76yPSj_as317_u5g@mail.gmail.com>
In-Reply-To
<vpqhaocqx4k.fsf@grenoble-inp.fr>

On Mon, Nov 26, 2012 at 3:03 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> Your initial message was about the output of "git log". Do you mean that
> the file, on the filesystem, does not have the line introduced by the
> commit?
Yes, sorry if I was not clear enough.
> If so, check the content registered in the repository too:
>
> git show <merge-commit>:<file-name>

Content shown is identical to the one in working copy, ie., it is missing one line change.

git annotate <file> <merge commit>
 - shows that particular line as if it has originated from when the
file was originally added to repo.
git annotate <file> <merge commit>^2
 - shows line as being modified by a commit done after file was added
- ie., state I would expect after a merge
Previous: Matthieu MoyNext: Matthieu Moy
Message 8 of 13 in “commit gone after merge - how to debug?”
  1. Igor LautarNov 26, 2012
  2. Tomas CarneckyNov 26, 2012
  3. Matthieu MoyNov 26, 2012
  4. Igor LautarNov 26, 2012
  5. Matthieu MoyNov 26, 2012
  6. Igor LautarNov 26, 2012
  7. Matthieu MoyNov 26, 2012
  8. Igor LautarNov 26, 2012
  9. Matthieu MoyNov 26, 2012
  10. Igor LautarNov 26, 2012
  11. Matthieu MoyNov 26, 2012
  12. Igor LautarNov 26, 2012
  13. Igor LautarNov 26, 2012

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.