From aa8f98c1bfcf162e0bd23d20c34857940f2c2256 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 17 Aug 2010 02:01:15 -0500 Subject: merge-base --octopus to mimic show-branch --merge-base While show-branch --merge-base does not support more than MAX_REVS revs, git supports more with a different algorithm (v1.6.0-rc0~51^2~13, Introduce get_octopus_merge_bases() in commit.c, 2008-06-27). Expose that functionality. This should help scripts to catch up with builtin merge in supporting dodecapus. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t6010-merge-base.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 't/t6010-merge-base.sh') diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 4466e45790..001431b363 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -164,9 +164,11 @@ test_expect_success 'merge-base A B C' ' git rev-parse --verify MMR >expected.sb && git merge-base --all MMA MMB MMC >actual && + git merge-base --all --octopus MMA MMB MMC >actual.common && git show-branch --merge-base MMA MMB MMC >actual.sb && test_cmp expected actual && + test_cmp expected.sb actual.common && test_cmp expected.sb actual.sb ' -- cgit v1.2.1