test-reach: test in_merge_bases

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index 620bb460414eb529d2b0db225a10de9c4507c83a..f93ad5084d57547874da8457bcca96922c772015 100644 (file)
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -9,6 +9,7 @@
 int cmd__reach(int ac, const char **av)
 {
        struct object_id oid_A, oid_B;
+       struct commit *A, *B;
        struct strbuf buf = STRBUF_INIT;
        struct repository *r = the_repository;
 
@@ -17,6 +18,7 @@ int cmd__reach(int ac, const char **av)
        if (ac < 2)
                exit(1);
 
+       A = B = NULL;
 
        while (strbuf_getline(&buf, stdin) != EOF) {
                struct object_id oid;
@@ -44,10 +46,12 @@ int cmd__reach(int ac, const char **av)
                switch (buf.buf[0]) {
                        case 'A':
                                oidcpy(&oid_A, &oid);
+                               A = c;
                                break;
 
                        case 'B':
                                oidcpy(&oid_B, &oid);
+                               B = c;
                                break;
 
                        default:
@@ -58,6 +62,8 @@ int cmd__reach(int ac, const char **av)
 
        if (!strcmp(av[1], "ref_newer"))
                printf("%s(A,B):%d\n", av[1], ref_newer(&oid_A, &oid_B));
+       else if (!strcmp(av[1], "in_merge_bases"))
+               printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B));
 
        exit(0);
 }

diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index 966309c6cfb2eca3f5a390f618b29baef5cb8eaa..5cd6b14c69854b39d1ab22a6588cfd74308c465c 100755 (executable)
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -83,4 +83,22 @@ test_expect_success 'ref_newer:hit' '
        test_three_modes ref_newer
 '
 
+test_expect_success 'in_merge_bases:hit' '
+       cat >input <<-\EOF &&
+       A:commit-5-7
+       B:commit-8-8
+       EOF
+       echo "in_merge_bases(A,B):1" >expect &&
+       test_three_modes in_merge_bases
+'
+
+test_expect_success 'in_merge_bases:miss' '
+       cat >input <<-\EOF &&
+       A:commit-6-8
+       B:commit-5-9
+       EOF
+       echo "in_merge_bases(A,B):0" >expect &&
+       test_three_modes in_merge_bases
+'
+
 test_done