diff options
Diffstat (limited to 'tests/revert')
-rw-r--r-- | tests/revert/bare.c | 107 | ||||
-rw-r--r-- | tests/revert/workdir.c (renamed from tests/revert/revert.c) | 26 |
2 files changed, 120 insertions, 13 deletions
diff --git a/tests/revert/bare.c b/tests/revert/bare.c new file mode 100644 index 000000000..206c86d70 --- /dev/null +++ b/tests/revert/bare.c @@ -0,0 +1,107 @@ +#include "clar.h" +#include "clar_libgit2.h" + +#include "buffer.h" +#include "fileops.h" +#include "git2/revert.h" + +#include "../merge/merge_helpers.h" + +#define TEST_REPO_PATH "revert" + +static git_repository *repo; + +// Fixture setup and teardown +void test_revert_bare__initialize(void) +{ + repo = cl_git_sandbox_init(TEST_REPO_PATH); +} + +void test_revert_bare__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_revert_bare__automerge(void) +{ + git_commit *head_commit, *revert_commit; + git_oid head_oid, revert_oid; + git_index *index; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, + { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, + { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, + { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, + }; + + git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); + cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); + + git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); + cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); + + cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); + cl_assert(merge_test_index(index, merge_index_entries, 4)); + + git_commit_free(revert_commit); + git_commit_free(head_commit); + git_index_free(index); +} + +void test_revert_bare__conflicts(void) +{ + git_reference *head_ref; + git_commit *head_commit, *revert_commit; + git_oid revert_oid; + git_index *index; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt" }, + { 0100644, "4b8fcff56437e60f58e9a6bc630dd242ebf6ea2c", 2, "file1.txt" }, + { 0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 3, "file1.txt" }, + { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, + { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, + { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, + }; + + git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); + + cl_git_pass(git_repository_head(&head_ref, repo)); + cl_git_pass(git_reference_peel((git_object **)&head_commit, head_ref, GIT_OBJ_COMMIT)); + + cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); + cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); + + cl_assert(git_index_has_conflicts(index)); + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_commit_free(revert_commit); + git_commit_free(head_commit); + git_reference_free(head_ref); + git_index_free(index); +} + +void test_revert_bare__orphan(void) +{ + git_commit *head_commit, *revert_commit; + git_oid head_oid, revert_oid; + git_index *index; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, + }; + + git_oid_fromstr(&head_oid, "39467716290f6df775a91cdb9a4eb39295018145"); + cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); + + git_oid_fromstr(&revert_oid, "ebb03002cee5d66c7732dd06241119fe72ab96a5"); + cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); + + cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); + cl_assert(merge_test_index(index, merge_index_entries, 1)); + + git_commit_free(revert_commit); + git_commit_free(head_commit); + git_index_free(index); +} diff --git a/tests/revert/revert.c b/tests/revert/workdir.c index 4a45190b9..7cdb24cf8 100644 --- a/tests/revert/revert.c +++ b/tests/revert/workdir.c @@ -13,13 +13,13 @@ static git_repository *repo; static git_index *repo_index; // Fixture setup and teardown -void test_revert_revert__initialize(void) +void test_revert_workdir__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); git_repository_index(&repo_index, repo); } -void test_revert_revert__cleanup(void) +void test_revert_workdir__cleanup(void) { git_index_free(repo_index); cl_git_sandbox_cleanup(); @@ -27,7 +27,7 @@ void test_revert_revert__cleanup(void) /* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 * git revert --no-commit d1d403d22cbe24592d725f442835cf46fe60c8ac */ -void test_revert_revert__automerge(void) +void test_revert_workdir__automerge(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; @@ -54,7 +54,7 @@ void test_revert_revert__automerge(void) } /* git revert --no-commit 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 */ -void test_revert_revert__conflicts(void) +void test_revert_workdir__conflicts(void) { git_reference *head_ref; git_commit *head, *commit; @@ -114,7 +114,7 @@ void test_revert_revert__conflicts(void) /* git reset --hard 39467716290f6df775a91cdb9a4eb39295018145 * git revert --no-commit ebb03002cee5d66c7732dd06241119fe72ab96a5 */ -void test_revert_revert__orphan(void) +void test_revert_workdir__orphan(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; @@ -139,7 +139,7 @@ void test_revert_revert__orphan(void) /* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 * git revert --no-commit d1d403d22cbe24592d725f442835cf46fe60c8ac */ -void test_revert_revert__conflict_use_ours(void) +void test_revert_workdir__conflict_use_ours(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; @@ -182,7 +182,7 @@ void test_revert_revert__conflict_use_ours(void) /* git reset --hard cef56612d71a6af8d8015691e4865f7fece905b5 * git revert --no-commit 55568c8de5322ff9a95d72747a239cdb64a19965 */ -void test_revert_revert__rename_1_of_2(void) +void test_revert_workdir__rename_1_of_2(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; @@ -216,7 +216,7 @@ void test_revert_revert__rename_1_of_2(void) /* git reset --hard 55568c8de5322ff9a95d72747a239cdb64a19965 * git revert --no-commit HEAD~1 */ -void test_revert_revert__rename(void) +void test_revert_workdir__rename(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; @@ -250,7 +250,7 @@ void test_revert_revert__rename(void) } /* git revert --no-commit HEAD */ -void test_revert_revert__head(void) +void test_revert_workdir__head(void) { git_reference *head; git_commit *commit; @@ -275,7 +275,7 @@ void test_revert_revert__head(void) git_commit_free(commit); } -void test_revert_revert__nonmerge_fails_mainline_specified(void) +void test_revert_workdir__nonmerge_fails_mainline_specified(void) { git_reference *head; git_commit *commit; @@ -295,7 +295,7 @@ void test_revert_revert__nonmerge_fails_mainline_specified(void) /* git reset --hard 5acdc74af27172ec491d213ee36cea7eb9ef2579 * git revert HEAD */ -void test_revert_revert__merge_fails_without_mainline_specified(void) +void test_revert_workdir__merge_fails_without_mainline_specified(void) { git_commit *head; git_oid head_oid; @@ -313,7 +313,7 @@ void test_revert_revert__merge_fails_without_mainline_specified(void) /* git reset --hard 5acdc74af27172ec491d213ee36cea7eb9ef2579 * git revert HEAD -m1 --no-commit */ -void test_revert_revert__merge_first_parent(void) +void test_revert_workdir__merge_first_parent(void) { git_commit *head; git_oid head_oid; @@ -338,7 +338,7 @@ void test_revert_revert__merge_first_parent(void) git_commit_free(head); } -void test_revert_revert__merge_second_parent(void) +void test_revert_workdir__merge_second_parent(void) { git_commit *head; git_oid head_oid; |