diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-27 00:44:36 +0300 |
---|---|---|
committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 23:37:33 +0300 |
commit | 99d9d9a470ca9b693f6dbee05f1cfcd98a5d148d (patch) | |
tree | a987102882cc3e6896b6d81422a068a64233d0ae | |
parent | a200bcf72838488c1550b1709a3f075f722e0244 (diff) |
merge: improve test names in recursive merge tests
-rw-r--r-- | tests/merge/trees/recursive.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c index cd879677f..bff5d7e39 100644 --- a/tests/merge/trees/recursive.c +++ b/tests/merge/trees/recursive.c @@ -18,7 +18,7 @@ void test_merge_trees_recursive__cleanup(void) cl_git_sandbox_cleanup(); } -void test_merge_trees_recursive__one(void) +void test_merge_trees_recursive__one_base_commit(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -39,7 +39,7 @@ void test_merge_trees_recursive__one(void) git_index_free(index); } -void test_merge_trees_recursive__one_norecursive(void) +void test_merge_trees_recursive__one_base_commit_norecursive(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -62,7 +62,7 @@ void test_merge_trees_recursive__one_norecursive(void) git_index_free(index); } -void test_merge_trees_recursive__two(void) +void test_merge_trees_recursive__two_base_commits(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -83,7 +83,7 @@ void test_merge_trees_recursive__two(void) git_index_free(index); } -void test_merge_trees_recursive__two_norecursive(void) +void test_merge_trees_recursive__two_base_commits_norecursive(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -108,7 +108,7 @@ void test_merge_trees_recursive__two_norecursive(void) git_index_free(index); } -void test_merge_trees_recursive__three(void) +void test_merge_trees_recursive__two_levels_of_multiple_bases(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -129,7 +129,7 @@ void test_merge_trees_recursive__three(void) git_index_free(index); } -void test_merge_trees_recursive__three_norecursive(void) +void test_merge_trees_recursive__two_levels_of_multiple_bases_norecursive(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -154,7 +154,7 @@ void test_merge_trees_recursive__three_norecursive(void) git_index_free(index); } -void test_merge_trees_recursive__four(void) +void test_merge_trees_recursive__three_levels_of_multiple_bases(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; @@ -175,7 +175,7 @@ void test_merge_trees_recursive__four(void) git_index_free(index); } -void test_merge_trees_recursive__four_norecursive(void) +void test_merge_trees_recursive__three_levels_of_multiple_bases_norecursive(void) { git_index *index; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; |