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

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

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

From: Russell King <hidden>
Date: 2016-06-15 22:41:55

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.

-- 
Russell King

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

From: Petr Baudis <hidden>
Date: 2016-06-15 22:41:55

Dear diary, on Fri, Apr 29, 2005 at 11:31:00AM CEST, I got a letter
where Russell King [off-list ref] told me that...
On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help