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

Re: Fix interesting git-rev-list corner case

From
Linus Torvalds <torvalds@osdl.org>
Date
Jul 30, 2005, 21:32 UTC
Message-ID
<Pine.LNX.4.58.0507301428300.29650@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.58.0507302259140.26128@telia.com>
On Sat, 30 Jul 2005, Peter Osterlund wrote:
Show 5 quoted lines
> >
> > Can you send me your HEAD and MERGE_HEAD (don't do the merge).
> 
> HEAD      : 33ac02aa4cef417871e128ab4a6565e751e5f3b2
> MERGE_HEAD: b0825488a642cadcf39709961dde61440cb0731c
Bingo.

Yup, it's git-merge-base, and it is confused by the same thing that confused git-rev-list.

Thanks, I'll fix it.
		Linus
Previous: Peter OsterlundNext: Linus Torvalds
Message 11 of 15 in “Fix interesting git-rev-list corner case”
  1. Linus TorvaldsJul 29, 2005
  2. Ryan AndersonJul 30, 2005
  3. A Large Angry SCMJul 30, 2005
  4. Linus TorvaldsJul 30, 2005
  5. Linus TorvaldsJul 30, 2005
  6. Peter OsterlundJul 30, 2005
  7. Linus TorvaldsJul 30, 2005
  8. Peter OsterlundJul 30, 2005
  9. Linus TorvaldsJul 30, 2005
  10. Peter OsterlundJul 30, 2005
  11. Linus TorvaldsJul 30, 2005
  12. Linus TorvaldsJul 30, 2005
  13. Peter OsterlundJul 30, 2005
  14. Linus TorvaldsJul 31, 2005
  15. Junio C HamanoJul 31, 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.