Re: [PATCH 11/16] test-reach: test get_merge_bases_many

[Jonathan Tan]

> @@ -71,6 +78,14 @@ int cmd__reach(int ac, const char **av)
>   printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B));
>   else if (!strcmp(av[1], "is_descendant_of"))
>   printf("%s(A,X):%d\n", av[1], is_descendant_of(A, X));
> + else if (!strcmp(av[1], "get_merge_bases_many")) {
> + struct commit_list *list = get_merge_bases_many(A, X_nr, 
> X_array);
> + printf("%s(A,X):\n", av[1]);
> + while (list) {
> + printf("%s\n", oid_to_hex(>item->object.oid));
> + list = list->next;
> + }

I don't think get_merge_bases_many defines a sort order on its output?
It might be better to sort the resulting commit list here, so that the
output is more well-defined. (And omit the informational printf so that
it's slightly easier to generate the "expect" file.)

Re: [PATCH 11/16] test-reach: test get_merge_bases_many

[Stefan Beller]

> +test_expect_success 'get_merge_bases_many' '
> +   cat >input <<-\EOF &&
> +   A:commit-5-7
> +   X:commit-4-8
> +   X:commit-6-6
> +   X:commit-8-3
> +   EOF
> +   {
> +   printf "get_merge_bases_many(A,X):\n" &&
> +   git rev-parse commit-5-6 &&
> +   git rev-parse commit-4-7

Please call rev-parse only once, giving both tips as argument, i.e.

   printf "get_merge_bases_many(A,X):\n" &&
   git rev-parse commit-5-6 \
 commit-4-7

ought to produce the same output

Thanks,
Stefan

[PATCH 11/16] test-reach: test get_merge_bases_many

[Derrick Stolee via GitGitGadget]

From: Derrick Stolee 

The get_merge_bases_many method returns a list of merge bases for a
single commit (A) against a list of commits (X). Some care is needed in
constructing the expected behavior because the result is not the
expected merge-base for an octopus merge with those parents but instead
the set of maximal commits that are reachable from A and at least one of
the commits in X.

Add get_merge_bases_many to 'test-tool reach' and create a test that
demonstrates that this output returns multiple results. Specifically, we
select a list of three commits such that we output two commits that are
reachable from one of the first two, respectively, and none are
reachable from the third.

Signed-off-by: Derrick Stolee 
---
 t/helper/test-reach.c | 15 +++
 t/t6600-test-reach.sh | 15 +++
 2 files changed, 30 insertions(+)

diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index 149e8f32c..97c726040 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -10,6 +10,8 @@ int cmd__reach(int ac, const char **av)
struct object_id oid_A, oid_B;
struct commit *A, *B;
struct commit_list *X;
+   struct commit **X_array;
+   int X_nr, X_alloc;
struct strbuf buf = STRBUF_INIT;
struct repository *r = the_repository;
 
@@ -20,6 +22,9 @@ int cmd__reach(int ac, const char **av)
 
A = B = NULL;
X = NULL;
+   X_nr = 0;
+   X_alloc = 16;
+   ALLOC_ARRAY(X_array, X_alloc);
 
while (strbuf_getline(, stdin) != EOF) {
struct object_id oid;
@@ -57,6 +62,8 @@ int cmd__reach(int ac, const char **av)
 
case 'X':
commit_list_insert(c, );
+   ALLOC_GROW(X_array, X_nr + 1, X_alloc);
+   X_array[X_nr++] = c;
break;
 
default:
@@ -71,6 +78,14 @@ int cmd__reach(int ac, const char **av)
printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B));
else if (!strcmp(av[1], "is_descendant_of"))
printf("%s(A,X):%d\n", av[1], is_descendant_of(A, X));
+   else if (!strcmp(av[1], "get_merge_bases_many")) {
+   struct commit_list *list = get_merge_bases_many(A, X_nr, 
X_array);
+   printf("%s(A,X):\n", av[1]);
+   while (list) {
+   printf("%s\n", oid_to_hex(>item->object.oid));
+   list = list->next;
+   }
+   }
 
exit(0);
 }
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index 99444e0f7..19e39ad7c 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -123,4 +123,19 @@ test_expect_success 'is_descendant_of:miss' '
test_three_modes is_descendant_of
 '
 
+test_expect_success 'get_merge_bases_many' '
+   cat >input <<-\EOF &&
+   A:commit-5-7
+   X:commit-4-8
+   X:commit-6-6
+   X:commit-8-3
+   EOF
+   {
+   printf "get_merge_bases_many(A,X):\n" &&
+   git rev-parse commit-5-6 &&
+   git rev-parse commit-4-7
+   } >expect &&
+   test_three_modes get_merge_bases_many
+'
+
 test_done
-- 
gitgitgadget