]>
Commit | Line | Data |
---|---|---|
eac938d9 ET |
1 | #include "clar.h" |
2 | #include "clar_libgit2.h" | |
3 | ||
22a2d3d5 | 4 | #include "futils.h" |
eac938d9 ET |
5 | #include "git2/revert.h" |
6 | ||
7 | #include "../merge/merge_helpers.h" | |
8 | ||
9 | #define TEST_REPO_PATH "revert" | |
10 | ||
11 | static git_repository *repo; | |
12 | ||
ac3d33df | 13 | /* Fixture setup and teardown */ |
eac938d9 ET |
14 | void test_revert_bare__initialize(void) |
15 | { | |
16 | repo = cl_git_sandbox_init(TEST_REPO_PATH); | |
17 | } | |
18 | ||
19 | void test_revert_bare__cleanup(void) | |
20 | { | |
21 | cl_git_sandbox_cleanup(); | |
22 | } | |
23 | ||
24 | void test_revert_bare__automerge(void) | |
25 | { | |
26 | git_commit *head_commit, *revert_commit; | |
27 | git_oid head_oid, revert_oid; | |
28 | git_index *index; | |
29 | ||
30 | struct merge_index_entry merge_index_entries[] = { | |
31 | { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, | |
32 | { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, | |
33 | { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, | |
34 | { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, | |
35 | }; | |
36 | ||
37 | git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); | |
38 | cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); | |
39 | ||
40 | git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); | |
41 | cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); | |
42 | ||
43 | cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); | |
44 | cl_assert(merge_test_index(index, merge_index_entries, 4)); | |
45 | ||
46 | git_commit_free(revert_commit); | |
47 | git_commit_free(head_commit); | |
48 | git_index_free(index); | |
49 | } | |
50 | ||
51 | void test_revert_bare__conflicts(void) | |
52 | { | |
53 | git_reference *head_ref; | |
54 | git_commit *head_commit, *revert_commit; | |
55 | git_oid revert_oid; | |
56 | git_index *index; | |
57 | ||
58 | struct merge_index_entry merge_index_entries[] = { | |
59 | { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt" }, | |
60 | { 0100644, "4b8fcff56437e60f58e9a6bc630dd242ebf6ea2c", 2, "file1.txt" }, | |
61 | { 0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 3, "file1.txt" }, | |
62 | { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, | |
63 | { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, | |
64 | { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, | |
65 | }; | |
66 | ||
67 | git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); | |
68 | ||
69 | cl_git_pass(git_repository_head(&head_ref, repo)); | |
ac3d33df | 70 | cl_git_pass(git_reference_peel((git_object **)&head_commit, head_ref, GIT_OBJECT_COMMIT)); |
eac938d9 ET |
71 | |
72 | cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); | |
73 | cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); | |
74 | ||
75 | cl_assert(git_index_has_conflicts(index)); | |
76 | cl_assert(merge_test_index(index, merge_index_entries, 6)); | |
77 | ||
78 | git_commit_free(revert_commit); | |
79 | git_commit_free(head_commit); | |
80 | git_reference_free(head_ref); | |
81 | git_index_free(index); | |
82 | } | |
83 | ||
84 | void test_revert_bare__orphan(void) | |
85 | { | |
86 | git_commit *head_commit, *revert_commit; | |
87 | git_oid head_oid, revert_oid; | |
88 | git_index *index; | |
89 | ||
90 | struct merge_index_entry merge_index_entries[] = { | |
91 | { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, | |
92 | }; | |
93 | ||
94 | git_oid_fromstr(&head_oid, "39467716290f6df775a91cdb9a4eb39295018145"); | |
95 | cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); | |
96 | ||
97 | git_oid_fromstr(&revert_oid, "ebb03002cee5d66c7732dd06241119fe72ab96a5"); | |
98 | cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); | |
99 | ||
100 | cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); | |
101 | cl_assert(merge_test_index(index, merge_index_entries, 1)); | |
102 | ||
103 | git_commit_free(revert_commit); | |
104 | git_commit_free(head_commit); | |
105 | git_index_free(index); | |
106 | } |