Code

merge-base: update the clean-up postprocessing
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Jul 2006 01:46:42 +0000 (18:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 9 Jul 2006 10:38:12 +0000 (03:38 -0700)
commitf324943816789fa047441f66edbe11669dc8a9ab
treea31bb33628df4630c3241732e697bed41a54d0e5
parentff4c848527137b5ca52dfe97c25fcc8bcc4b8726
merge-base: update the clean-up postprocessing

This removes the "contaminate the well even more" approach
taken in the current merge-base postprosessing code.  Instead,
when there are more than one merge-base results, we compute the
merge-base between them and see if one is a fast-forward of the
other, in which case the ancestor is removed from the result.

Signed-off-by: Junio C Hamano <junkio@cox.net>
commit.c