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

commit gone after merge - how to debug?

From
ILIgor Lautar <igor.lautar@gmail.com>
Date
Nov 26, 2012, 13:06 UTC
Message-ID
<CAO1Khk_eugH--wp3s-gr4HTvuRyL=SaWHWtEXCRZ_Ak7+s5U=w@mail.gmail.com>
Hi,
This looks really weird and I cannot explain why it occurs.
Setup is as follows:
 - origin
 - mirror
 - local clone

Reference repository is origin from where builds are done etc. Parallel to that, we keep a mirror that is synced manually (fetch/merge/push).

I do this from my local clone (which is mostly just tracking origin and mirror, no local branches).

What happened is that after a merge of mirror/master into local master, a commit (that also exists on origin/master) is lost.

Lost as in:
pre-merge:
git log <file modified by commit>
 - commit shown in history
git merge mirror/master
 - no conflicts
git log <file modified by commit>
 - commit NOT shown in file history any more and file does not have this change

Doing git log shows commit as being present in repository history. One interesting point is that one of the parents is previous merge commit of same branches.

Unfortunately, I cannot open up repository for public access, but would appreciate any pointers how to debug this.

git fsck finds some dangling blobs/commits, but no other warnings/errors, I can clone repo just fine, everything seams in order.

How can I debug what the merge is doing?

git version 1.7.12.1 on mac: Darwin 12.2.0 Darwin Kernel Version 12.2.0: Sat Aug 25 00:48:52 PDT 2012; root:xnu-2050.18.24~1/RELEASE_X86_64 x86_64

Regards, Igor

PS. please keep me in CC, I'm not on list
Next: Tomas Carnecky
Message 1 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.