tests/revert/bare.c

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