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

Re: Odd decision of git-pasky-0.7 to do a merge

From
Petr Baudis <pasky@ucw.cz>
Date
Apr 29, 2005, 18:21 UTC
Message-ID
<20050429182140.GA14202@pasky.ji.cz>
In-Reply-To
<20050429103059.A3260@flint.arm.linux.org.uk>

Dear diary, on Fri, Apr 29, 2005 at 11:31:00AM CEST, I got a letter where Russell King <rmk@arm.linux.org.uk> told me that...

Show 9 quoted lines
> On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:
> > rmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20
> > bdceb6a0162274934386f19f3ea5a9d44feb0b20
> > 
> > $ merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20
> > e8108c98dd6d65613fa0ec9d2300f89c48d554bf
> 
> This is the problem.  It seems that merge-base in git-pasky-0.7
> doesn't work correctly.

I'm not sure if the merge-base in git-pasky-0.7 isn't the old one yet. We replaced it with a date-based one since the old one *was* giving bad results.

So, what about cogito-0.8?
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Previous: Russell KingNext: Linus Torvalds
Message 4 of 6 in “Odd decision of git-pasky-0.7 to do a merge”
  1. Russell KingApr 29, 2005
  2. Russell KingApr 29, 2005
  3. Russell KingApr 29, 2005
  4. Petr BaudisApr 29, 2005
  5. Linus TorvaldsApr 29, 2005
  6. Russell KingApr 29, 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.