undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-reach: test in_merge_bases

Browse Source 
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2018-07-20 16:33:17 +00:00 committed by Junio C Hamano
parent ab176ac4ae
commit 5cd52de326
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/helper/test-reach.c
View File

@ -9,6 +9,7 @@
int cmd__reach(int ac, const char **av) int cmd__reach(int ac, const char **av)
{ {
struct object_id oid_A, oid_B; struct object_id oid_A, oid_B;
struct commit *A, *B;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct repository *r = the_repository; struct repository *r = the_repository;
@ -17,6 +18,7 @@ int cmd__reach(int ac, const char **av)
if (ac < 2) if (ac < 2)
exit(1); exit(1);
A = B = NULL;
while (strbuf_getline(&buf, stdin) != EOF) { while (strbuf_getline(&buf, stdin) != EOF) {
struct object_id oid; struct object_id oid;
@ -44,10 +46,12 @@ int cmd__reach(int ac, const char **av)
switch (buf.buf[0]) { switch (buf.buf[0]) {
case 'A': case 'A':
oidcpy(&oid_A, &oid); oidcpy(&oid_A, &oid);
A = c;
break; break;
case 'B': case 'B':
oidcpy(&oid_B, &oid); oidcpy(&oid_B, &oid);
B = c;
break; break;
default: default:
@ -58,6 +62,8 @@ int cmd__reach(int ac, const char **av)
if (!strcmp(av[1], "ref_newer")) if (!strcmp(av[1], "ref_newer"))
printf("%s(A,B):%d\n", av[1], ref_newer(&oid_A, &oid_B)); 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); exit(0);
} }

18
t/t6600-test-reach.sh
View File

@ -83,4 +83,22 @@ test_expect_success 'ref_newer:hit' '
test_three_modes ref_newer 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 test_done