summaryrefslogtreecommitdiff
path: root/test/test-gall.repository.lua
diff options
context:
space:
mode:
Diffstat (limited to 'test/test-gall.repository.lua')
-rw-r--r--test/test-gall.repository.lua8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/test-gall.repository.lua b/test/test-gall.repository.lua
index 8fb6ab9..f945864 100644
--- a/test/test-gall.repository.lua
+++ b/test/test-gall.repository.lua
@@ -214,6 +214,14 @@ 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.rev_list()
local repo = test_repo()
local sha_new = "0b65c32b6a5277ff0e75ddad9e3914148914042d"