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

Re: bogus merges

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Sep 6, 2005, 18:28 UTC
Message-ID
<Pine.LNX.4.63.0509061409180.23242@iabervon.org>
In-Reply-To
<Pine.LNX.4.58.0509050853080.3568@evo.osdl.org>
On Mon, 5 Sep 2005, Linus Torvalds wrote:
Show 6 quoted lines
> On Mon, 5 Sep 2005, Wayne Scott wrote:
> >
> > A recent commit in linux-2.6 looks like this:
> 
> It hopefully shouldn't happen any more with the improved and fixed
> git-merge-base.

Couldn't it also happen if there's stale data in MERGE_HEAD when you commit a normal patch? The description doesn't look like a merge at all, but rather like a normal patch that inappropriately picked up an extra head. I'd guess he tried to merge something, got a conflict, decided that he didn't really want to do that anyway, switched to a different branch, applied a patch, and committed without noticing the note that he seemed to be committing a merge.

Probably the right thing is actually to clean up more when switching tasks, but it would probably also be worth checking that merges make sense as well.

	-Daniel
*This .sig left intentionally blank*
Previous: Russell KingNext: Russell King
Message 5 of 13 in “bogus merges”
  1. Wayne ScottSep 5, 2005
  2. Linus TorvaldsSep 5, 2005
  3. Wayne ScottSep 6, 2005
  4. Russell KingSep 11, 2005
  5. Daniel BarkalowSep 6, 2005
  6. Russell KingSep 11, 2005
  7. Daniel BarkalowSep 11, 2005
  8. Petr BaudisSep 12, 2005
  9. Russell KingSep 11, 2005
  10. Martin LanghoffSep 11, 2005
  11. A Large Angry SCMSep 11, 2005
  12. Russell KingSep 11, 2005
  13. Russell KingSep 11, 2005

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.