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

Re: How to find and analyze bad merges?

From
NGNeal Groothuis <ngroot@lo-cal.org>
Date
Feb 2, 2012, 15:09 UTC
Message-ID
<8489.38.96.167.131.1328195376.squirrel@mail.lo-cal.org>
In-Reply-To
<jgduqg$p9f$1@dough.gmane.org>
Show 9 quoted lines
>> See the thread [1] for a few relevant side-notes.
>  >
>  > [1] http://thread.gmane.org/gmane.comp.version-control.git/188904
>
> As I understand this thread, the user only requested all commits that
> "modify a file". Our merge-commit strictly speaking did not modify the
> file but simply kept one of the versions, completely swamping all
> modifications from one branch. Exactly the case that is still not
> covered by --full-history.

The thread was prompted by the difficulty I had in figuring out where a co-worker had accidentally squashed changes in a branch that was being merged in; I think that's the same issue that you have described.

Re: the merge: it kept one of the versions, but not the other; I would
consider that a change.  This is particularly problematic if you do a "git
log --full-history --simplify-merges".  The simplified history that is
presented will not show the merge, even though in the simplified history
the merge turns into a regular commit that differs from its parent.  It
seems that the history is being simplified to the point of being
inaccurate.

I believe that this is a result checking for TREESAME-ness before the history simplification occurs, rather than after. I would love to see this behavior changed, or at the least, an option added to allow the user to control it.

Previous: norbert.nemecNext: norbert.nemec
Message 10 of 11 in “How to find and analyze bad merges?”
  1. norbert.nemecFeb 2, 2012
  2. Junio C HamanoFeb 2, 2012
  3. norbert.nemecFeb 2, 2012
  4. Junio C HamanoFeb 2, 2012
  5. norbert.nemecFeb 2, 2012
  6. Norbert NemecFeb 2, 2012
  7. David BarrFeb 2, 2012
  8. Jonathan NiederFeb 2, 2012
  9. norbert.nemecFeb 2, 2012
  10. Neal GroothuisFeb 2, 2012
  11. norbert.nemecFeb 2, 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.