1 #include "clar_libgit2.h"
2 #include "apply_helpers.h"
3 #include "../merge/merge_helpers.h"
5 static git_repository
*repo
;
7 #define TEST_REPO_PATH "merge-recursive"
10 void test_apply_tree__initialize(void)
12 repo
= cl_git_sandbox_init(TEST_REPO_PATH
);
15 void test_apply_tree__cleanup(void)
17 cl_git_sandbox_cleanup();
20 void test_apply_tree__one(void)
23 git_commit
*a_commit
, *b_commit
;
24 git_tree
*a_tree
, *b_tree
;
26 git_index
*index
= NULL
;
27 git_diff_options opts
= GIT_DIFF_OPTIONS_INIT
;
29 struct merge_index_entry expected
[] = {
30 { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
31 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
32 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
33 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
34 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
35 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
38 git_oid_fromstr(&a_oid
, "539bd011c4822c560c1d17cab095006b7a10f707");
39 git_oid_fromstr(&b_oid
, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
41 cl_git_pass(git_commit_lookup(&a_commit
, repo
, &a_oid
));
42 cl_git_pass(git_commit_lookup(&b_commit
, repo
, &b_oid
));
44 cl_git_pass(git_commit_tree(&a_tree
, a_commit
));
45 cl_git_pass(git_commit_tree(&b_tree
, b_commit
));
47 cl_git_pass(git_diff_tree_to_tree(&diff
, repo
, a_tree
, b_tree
, &opts
));
49 cl_git_pass(git_apply_to_tree(&index
, repo
, a_tree
, diff
, NULL
));
50 merge_test_index(index
, expected
, 6);
52 git_index_free(index
);
54 git_tree_free(a_tree
);
55 git_tree_free(b_tree
);
56 git_commit_free(a_commit
);
57 git_commit_free(b_commit
);
60 void test_apply_tree__adds_file(void)
66 git_index
*index
= NULL
;
68 struct merge_index_entry expected
[] = {
69 { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
70 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
71 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
72 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
73 { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
74 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
75 { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
78 git_oid_fromstr(&a_oid
, "539bd011c4822c560c1d17cab095006b7a10f707");
80 cl_git_pass(git_commit_lookup(&a_commit
, repo
, &a_oid
));
82 cl_git_pass(git_commit_tree(&a_tree
, a_commit
));
84 cl_git_pass(git_diff_from_buffer(&diff
,
85 DIFF_ADD_FILE
, strlen(DIFF_ADD_FILE
)));
87 cl_git_pass(git_apply_to_tree(&index
, repo
, a_tree
, diff
, NULL
));
88 merge_test_index(index
, expected
, 7);
90 git_index_free(index
);
92 git_tree_free(a_tree
);
93 git_commit_free(a_commit
);