1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
#!/usr/bin/env ruby
require File.dirname(__FILE__) + '/../test_helper'
class TestMergeBase < Test::Unit::TestCase
def setup
set_file_paths
end
def test_branch_and_master_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
true_ancestor_sha = repo.gcommit('master').sha
add_commit(repo, 'new_branch')
add_commit(repo, 'master')
ancestors = repo.merge_base('master', 'new_branch')
assert_equal(ancestors.size, 1) # there is only one true ancestor
assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor
end
end
end
def test_branch_and_master_independent_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
true_ancestor_sha = repo.gcommit('master').sha
add_commit(repo, 'new_branch')
add_commit(repo, 'master')
independent_commits = repo.merge_base(true_ancestor_sha, 'master', 'new_branch', independent: true)
assert_equal(independent_commits.size, 2) # both new master and a branch are unreachable from each other
true_independent_commits_shas = [repo.gcommit('master').sha, repo.gcommit('new_branch').sha]
assert_equal(independent_commits.map(&:sha).sort, true_independent_commits_shas.sort)
end
end
end
def test_branch_and_master_fork_point_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
add_commit(repo, 'master')
true_ancestor_sha = repo.gcommit('master').sha
add_commit(repo, 'new_branch')
repo.reset_hard(repo.gcommit('HEAD^'))
add_commit(repo, 'master')
ancestors = repo.merge_base('master', 'new_branch', fork_point: true)
assert_equal(ancestors.size, 1) # there is only one true ancestor
assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor
end
end
end
def test_branch_and_master_all_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
add_commit(repo, 'new_branch_1')
first_commit_sha = repo.gcommit('new_branch_1').sha
add_commit(repo, 'new_branch_2')
second_commit_sha = repo.gcommit('new_branch_2').sha
repo.branch('new_branch_1').merge('new_branch_2')
repo.branch('new_branch_2').merge('new_branch_1^')
add_commit(repo, 'new_branch_1')
add_commit(repo, 'new_branch_2')
true_ancestors_shas = [first_commit_sha, second_commit_sha]
ancestors = repo.merge_base('new_branch_1', 'new_branch_2')
assert_equal(ancestors.size, 1) # default behavior returns only one ancestor
assert(true_ancestors_shas.include?(ancestors.first.sha))
all_ancestors = repo.merge_base('new_branch_1', 'new_branch_2', all: true)
assert_equal(all_ancestors.size, 2) # there are two best ancestors in such case
assert_equal(all_ancestors.map(&:sha).sort, true_ancestors_shas.sort)
end
end
end
def test_branches_and_master_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
add_commit(repo, 'new_branch_1')
add_commit(repo, 'master')
non_octopus_ancestor_sha = repo.gcommit('master').sha
add_commit(repo, 'new_branch_2')
add_commit(repo, 'master')
ancestors = repo.merge_base('master', 'new_branch_1', 'new_branch_2')
assert_equal(ancestors.size, 1) # there is only one true ancestor
assert_equal(ancestors.first.sha, non_octopus_ancestor_sha) # proper common ancestor
end
end
end
def test_branches_and_master_octopus_merge_base
in_temp_dir do |_path|
repo = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
true_ancestor_sha = repo.gcommit('master').sha
add_commit(repo, 'new_branch_1')
add_commit(repo, 'master')
add_commit(repo, 'new_branch_2')
add_commit(repo, 'master')
ancestors = repo.merge_base('master', 'new_branch_1', 'new_branch_2', octopus: true)
assert_equal(ancestors.size, 1) # there is only one true ancestor
assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor
end
end
end
private
def add_commit(repo, branch_name)
@commit_number ||= 0
@commit_number += 1
repo.branch(branch_name).in_branch("test commit #{@commit_number}") do
new_file("new_file_#{@commit_number}", 'hello')
repo.add
true
end
end
end
|
