1 #include "clar_libgit2.h"
2 #include "git2/repository.h"
3 #include "git2/merge.h"
4 #include "merge.h"
5 #include "../merge_helpers.h"
6 #include "../conflict_data.h"
7
8 static git_repository *repo;
9
10 #define TEST_REPO_PATH "merge-resolve"
11
test_merge_trees_commits__initialize(void)12 void test_merge_trees_commits__initialize(void)
13 {
14 repo = cl_git_sandbox_init(TEST_REPO_PATH);
15 }
16
test_merge_trees_commits__cleanup(void)17 void test_merge_trees_commits__cleanup(void)
18 {
19 cl_git_sandbox_cleanup();
20 }
21
test_merge_trees_commits__automerge(void)22 void test_merge_trees_commits__automerge(void)
23 {
24 git_index *index;
25 const git_index_entry *entry;
26 git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
27 git_blob *blob;
28
29 struct merge_index_entry merge_index_entries[] = {
30 { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
31 { 0100644, "f2e1550a0c9e53d5811175864a29536642ae3821", 0, "automergeable.txt" },
32 { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt" },
33 { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" },
34
35 { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" },
36 { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
37 { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" },
38
39 { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" },
40 };
41
42 struct merge_reuc_entry merge_reuc_entries[] = {
43 { "automergeable.txt", 0100644, 0100644, 0100644, \
44 "6212c31dab5e482247d7977e4f0dd3601decf13b", \
45 "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", \
46 "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" },
47 { "removed-in-branch.txt", 0100644, 0100644, 0, \
48 "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \
49 "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \
50 "" },
51 { "removed-in-master.txt", 0100644, 0, 0100644, \
52 "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", \
53 "", \
54 "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" },
55 };
56
57 cl_git_pass(merge_commits_from_branches(&index, repo, "master", "branch", &opts));
58
59 cl_assert(merge_test_index(index, merge_index_entries, 8));
60 cl_assert(merge_test_reuc(index, merge_reuc_entries, 3));
61
62 cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
63 cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
64
65 cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJECT_BLOB));
66 cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
67
68 git_index_free(index);
69 git_blob_free(blob);
70 }
71
test_merge_trees_commits__no_ancestor(void)72 void test_merge_trees_commits__no_ancestor(void)
73 {
74 git_index *index;
75 git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
76
77 struct merge_index_entry merge_index_entries[] = {
78 { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
79 { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 2, "automergeable.txt" },
80 { 0100644, "d07ec190c306ec690bac349e87d01c4358e49bb2", 3, "automergeable.txt" },
81 { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" },
82 { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" },
83 { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
84 { 0100644, "4b253da36a0ae8bfce63aeabd8c5b58429925594", 3, "conflicting.txt" },
85 { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" },
86 { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" },
87 { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" },
88 { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" },
89 };
90
91 cl_git_pass(merge_commits_from_branches(&index, repo, "master", "unrelated", &opts));
92
93 cl_assert(merge_test_index(index, merge_index_entries, 11));
94
95 git_index_free(index);
96 }
97
test_merge_trees_commits__df_conflict(void)98 void test_merge_trees_commits__df_conflict(void)
99 {
100 git_index *index;
101 git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
102
103 struct merge_index_entry merge_index_entries[] = {
104 { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" },
105 { 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 3, "dir-10" },
106 { 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6" },
107 { 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 3, "dir-7" },
108 { 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 1, "dir-7/file.txt" },
109 { 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 2, "dir-7/file.txt" },
110 { 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8" },
111 { 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 2, "dir-9" },
112 { 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 1, "dir-9/file.txt" },
113 { 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 3, "dir-9/file.txt" },
114 { 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new" },
115 { 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 1, "file-2" },
116 { 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 2, "file-2" },
117 { 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new" },
118 { 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new" },
119 { 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 1, "file-4" },
120 { 0100644, "7663fce0130db092936b137cabd693ec234eb060", 3, "file-4" },
121 { 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" },
122 { 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 2, "file-5/new" },
123 { 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 3, "file-5/new" },
124 };
125
126 cl_git_pass(merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts));
127
128 cl_assert(merge_test_index(index, merge_index_entries, 20));
129
130 git_index_free(index);
131 }
132
test_merge_trees_commits__fail_on_conflict(void)133 void test_merge_trees_commits__fail_on_conflict(void)
134 {
135 git_index *index;
136 git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
137
138 opts.flags |= GIT_MERGE_FAIL_ON_CONFLICT;
139
140 cl_git_fail_with(GIT_EMERGECONFLICT,
141 merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts));
142
143 cl_git_fail_with(GIT_EMERGECONFLICT,
144 merge_commits_from_branches(&index, repo, "master", "unrelated", &opts));
145 cl_git_fail_with(GIT_EMERGECONFLICT,
146 merge_commits_from_branches(&index, repo, "master", "branch", &opts));
147 }
148
149