diff options
Diffstat (limited to 'test/test-gall.repository.lua')
| -rw-r--r-- | test/test-gall.repository.lua | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/test-gall.repository.lua b/test/test-gall.repository.lua index 8fb6ab9..0f59993 100644 --- a/test/test-gall.repository.lua +++ b/test/test-gall.repository.lua @@ -214,6 +214,22 @@ function suite.merge_base_nobase() assert(ok == true) end +function suite.merge_base_annotated_tags() + local repo = test_repo() + local sha_1 = "annotated-1" + local sha_2 = "annotated-2" + local sha_b = "b972b3345490a898f46df143a7285cb7840b9845" + assert(repo:merge_base(sha_1, sha_2) == sha_b) +end + +function suite.merge_base_lorries_regression() + local repo = test_repo("lorries.git") + local sha_1 = "738022ab867407fc9e906e89268043f72179730a" + local sha_2 = "2f0995c6c852c9b9d6ce584f3b9f38a981a40cf3" + local sha_b = "738022ab867407fc9e906e89268043f72179730a" + assert(repo:merge_base(sha_1, sha_2) == sha_b) +end + function suite.rev_list() local repo = test_repo() local sha_new = "0b65c32b6a5277ff0e75ddad9e3914148914042d" |