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

Re: bogus merges

From
RKRussell King <rmk@arm.linux.org.uk>
Date
Sep 11, 2005, 11:06 UTC
Message-ID
<20050911120611.B8236@flint.arm.linux.org.uk>
In-Reply-To
<59a6e58305090606082a23b048@mail.gmail.com>
On Tue, Sep 06, 2005 at 08:08:57AM -0500, Wayne Scott wrote:
Show 12 quoted lines
> On 9/5/05, Linus Torvalds <torvalds@osdl.org> wrote:
> > > Really 'git commit' should detect problems like this automatically and
> > > prevent them from getting in the tree.
> > 
> > Well, that would depend on having the fixed git-merge-base in the first
> > place, which in turn would mean that such a commit wouldn't happen at all,
> > so it's kind of circular. It's not worth fixing anywhere else, since once
> > you fix it in git-merge-base, it just becomes a non-issue.
> 
> This just error checking to prevent future bugs from getting committed
> to the tree.  These kinds of things are very hard to repair after the
> fact.
They don't get repaired.

The real problem is that there needs to be a way for cogito to remain more up to date with git, so that when problems are fixed in git they can propagate into cogito faster.

I'm not sure separating cogito from git is a good solution though - I've no real view on how stable the interface between those two bits are, but I'd hate for a git upgrade to break cogito in some subtle way.

-- 
Russell King
Previous: Wayne ScottNext: Daniel Barkalow
Message 4 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.