![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@osdl.org> | |
| Sat, 30 Jul 2005 22:10:20 +0000 (15:10 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 31 Jul 2005 05:58:21 +0000 (22:58 -0700) | ||
| commit | 4f7eb2e5a351e0d1f19fd4eab7e92834cc4528c2 | |
| tree | c483c133b7e04c27d639ae71a6f73ef5c4f25b88 | tree | snapshot |
| parent | 8cc6a083198877fc32224b73c61ec6e6cf8a96f5 | commit | diff |
Fix merge-base from getting confused.
On Sat, 30 Jul 2005, Linus Torvalds wrote:
>
> Yup, it's git-merge-base, and it is confused by the same thing that
> confused git-rev-list.
Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe
somebody else can come up with a better one. I think this one ends up
being quite a bit more expensive than the old one (it will look up _all_
common parents that have a child that isn't common, and then select the
newest one of the bunch), but I haven't really thought it through very
much.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
On Sat, 30 Jul 2005, Linus Torvalds wrote:
>
> Yup, it's git-merge-base, and it is confused by the same thing that
> confused git-rev-list.
Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe
somebody else can come up with a better one. I think this one ends up
being quite a bit more expensive than the old one (it will look up _all_
common parents that have a child that isn't common, and then select the
newest one of the bunch), but I haven't really thought it through very
much.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| merge-base.c | diff | blob | history |