diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:01:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:03 -0700 |
| commit | aa8f98c1bfcf162e0bd23d20c34857940f2c2256 (patch) | |
| tree | 7defce780500efc5e152b080e67143e22255829e /t/t6010-merge-base.sh | |
| parent | 1846e9edf6b9c8b8e84b96eab8753a1420b6b28d (diff) | |
| download | git-aa8f98c1bfcf162e0bd23d20c34857940f2c2256.tar.gz git-aa8f98c1bfcf162e0bd23d20c34857940f2c2256.tar.xz | |
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6010-merge-base.sh')
| -rwxr-xr-x | t/t6010-merge-base.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 4466e4579..001431b36 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 ' |