Commit d3f0875a60c4112f004c21aa0e02db7af9e79597
2015-12-25T00:34:39
merge driver: tests for custom default merge drivers
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/tests/merge/driver.c b/tests/merge/driver.c
index d451782..c29f87f 100644
--- a/tests/merge/driver.c
+++ b/tests/merge/driver.c
@@ -391,3 +391,62 @@ void test_merge_driver__apply_can_conflict(void)
git_merge_driver_unregister("conflict");
}
+void test_merge_driver__default_can_be_specified(void)
+{
+ git_oid their_id;
+ git_annotated_commit *their_head;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
+ const char *expected = "This is the `custom` driver.\n";
+
+ merge_opts.default_driver = "custom";
+
+ cl_git_pass(git_oid_fromstr(&their_id, BRANCH_ID));
+ cl_git_pass(git_annotated_commit_lookup(&their_head, repo, &their_id));
+
+ cl_git_pass(git_merge(repo, (const git_annotated_commit **)&their_head,
+ 1, &merge_opts, NULL));
+
+ git_annotated_commit_free(their_head);
+
+ cl_assert_equal_file(expected, strlen(expected),
+ TEST_REPO_PATH "/applied.txt");
+}
+
+void test_merge_driver__honors_builtin_mergedefault(void)
+{
+ const git_index_entry *ancestor, *ours, *theirs;
+
+ cl_repo_set_string(repo, "merge.default", "binary");
+ merge_branch();
+
+ cl_git_pass(git_index_conflict_get(&ancestor, &ours, &theirs,
+ repo_index, "automergeable.txt"));
+}
+
+void test_merge_driver__honors_custom_mergedefault(void)
+{
+ const char *expected = "This is the `custom` driver.\n";
+
+ cl_repo_set_string(repo, "merge.default", "custom");
+ merge_branch();
+
+ cl_assert_equal_file(expected, strlen(expected),
+ TEST_REPO_PATH "/applied.txt");
+}
+
+void test_merge_driver__mergedefault_deferring_falls_back_to_text(void)
+{
+ const git_index_entry *idx;
+
+ cl_git_pass(git_merge_driver_register("defer",
+ &test_driver_defer_check.base));
+
+ cl_repo_set_string(repo, "merge.default", "defer");
+ merge_branch();
+
+ cl_assert((idx = git_index_get_bypath(repo_index, "automergeable.txt", 0)));
+ cl_assert_equal_oid(&automergeable_id, &idx->id);
+
+ git_merge_driver_unregister("defer");
+}
+