diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/checkout/checkout_helpers.c | 2 | ||||
| -rw-r--r-- | tests/commit/write.c | 2 | ||||
| -rw-r--r-- | tests/network/fetchlocal.c | 2 | ||||
| -rw-r--r-- | tests/online/clone.c | 6 | ||||
| -rw-r--r-- | tests/rebase/merge.c | 6 | ||||
| -rw-r--r-- | tests/refs/branches/delete.c | 2 | ||||
| -rw-r--r-- | tests/refs/create.c | 10 | ||||
| -rw-r--r-- | tests/refs/normalize.c | 236 | ||||
| -rw-r--r-- | tests/refs/overwrite.c | 16 | ||||
| -rw-r--r-- | tests/refs/read.c | 14 | ||||
| -rw-r--r-- | tests/refs/rename.c | 6 | ||||
| -rw-r--r-- | tests/refs/setter.c | 14 | ||||
| -rw-r--r-- | tests/refs/update.c | 2 | ||||
| -rw-r--r-- | tests/repo/init.c | 2 |
14 files changed, 160 insertions, 160 deletions
diff --git a/tests/checkout/checkout_helpers.c b/tests/checkout/checkout_helpers.c index cecee6aae..8256644db 100644 --- a/tests/checkout/checkout_helpers.c +++ b/tests/checkout/checkout_helpers.c @@ -10,7 +10,7 @@ void assert_on_branch(git_repository *repo, const char *branch) git_buf bname = GIT_BUF_INIT; cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert_(git_reference_type(head) == GIT_REF_SYMBOLIC, branch); + cl_assert_(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC, branch); cl_git_pass(git_buf_joinpath(&bname, "refs/heads", branch)); cl_assert_equal_s(bname.ptr, git_reference_symbolic_target(head)); diff --git a/tests/commit/write.c b/tests/commit/write.c index 2ba74ca9b..d829c973d 100644 --- a/tests/commit/write.c +++ b/tests/commit/write.c @@ -157,7 +157,7 @@ void test_commit_write__root(void) /* First we need to update HEAD so it points to our non-existant branch */ cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC); head_old = git__strdup(git_reference_symbolic_target(head)); cl_assert(head_old != NULL); git_reference_free(head); diff --git a/tests/network/fetchlocal.c b/tests/network/fetchlocal.c index 91e2a0595..bedbcf9e8 100644 --- a/tests/network/fetchlocal.c +++ b/tests/network/fetchlocal.c @@ -369,7 +369,7 @@ void test_network_fetchlocal__clone_into_mirror(void) cl_git_pass(git_clone(&repo, cl_git_fixture_url("testrepo.git"), "./foo.git", &opts)); cl_git_pass(git_reference_lookup(&ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(ref)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(ref)); cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(ref)); git_reference_free(ref); diff --git a/tests/online/clone.c b/tests/online/clone.c index 928b7bc31..3f12a02a7 100644 --- a/tests/online/clone.c +++ b/tests/online/clone.c @@ -145,7 +145,7 @@ void test_online_clone__empty_repository(void) cl_assert_equal_i(true, git_repository_head_unborn(g_repo)); cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head)); cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); git_reference_free(head); @@ -185,7 +185,7 @@ void test_online_clone__can_checkout_a_cloned_repo(void) cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&path))); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head)); cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); cl_assert_equal_i(true, checkout_progress_cb_was_called); @@ -226,7 +226,7 @@ void test_online_clone__clone_mirror(void) cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo.git", &opts)); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head)); cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); cl_assert_equal_i(true, fetch_progress_cb_was_called); diff --git a/tests/rebase/merge.c b/tests/rebase/merge.c index 6a2bd38d2..cccaac7b8 100644 --- a/tests/rebase/merge.c +++ b/tests/rebase/merge.c @@ -450,7 +450,7 @@ void test_rebase_merge__finish(void) cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head_ref)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head_ref)); cl_assert_equal_s("refs/heads/gravy", git_reference_symbolic_target(head_ref)); /* Make sure the reflogs are updated appropriately */ @@ -512,7 +512,7 @@ void test_rebase_merge__detached_finish(void) cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_OID, git_reference_type(head_ref)); + cl_assert_equal_i(GIT_REFERENCE_DIRECT, git_reference_type(head_ref)); /* Make sure the reflogs are updated appropriately */ cl_git_pass(git_reflog_read(&reflog, repo, "HEAD")); @@ -561,7 +561,7 @@ void test_rebase_merge__finish_with_ids(void) cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_OID, git_reference_type(head_ref)); + cl_assert_equal_i(GIT_REFERENCE_DIRECT, git_reference_type(head_ref)); cl_assert_equal_oid(&commit_id, git_reference_target(head_ref)); /* reflogs are not updated as if we were operating on proper diff --git a/tests/refs/branches/delete.c b/tests/refs/branches/delete.c index 928adf73a..553d80033 100644 --- a/tests/refs/branches/delete.c +++ b/tests/refs/branches/delete.c @@ -72,7 +72,7 @@ void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD( git_reference *head, *branch; cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head)); cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); git_reference_free(head); diff --git a/tests/refs/create.c b/tests/refs/create.c index 469cddd1e..20ac579b3 100644 --- a/tests/refs/create.c +++ b/tests/refs/create.c @@ -41,13 +41,13 @@ void test_refs_create__symbolic(void) /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC); cl_assert(reference_is_packed(looked_up_ref) == 0); cl_assert_equal_s(looked_up_ref->name, new_head_tracker); /* ...peeled.. */ cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); + cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT); /* ...and that it points to the current master tip */ cl_assert_equal_oid(&id, git_reference_target(resolved_ref)); @@ -91,7 +91,7 @@ void test_refs_create__symbolic_with_arbitrary_content(void) /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC); cl_assert(reference_is_packed(looked_up_ref) == 0); cl_assert_equal_s(looked_up_ref->name, new_head_tracker); git_reference_free(looked_up_ref); @@ -104,7 +104,7 @@ void test_refs_create__symbolic_with_arbitrary_content(void) /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head_tracker)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC); cl_assert(reference_is_packed(looked_up_ref) == 0); cl_assert_equal_s(looked_up_ref->name, new_head_tracker); @@ -152,7 +152,7 @@ void test_refs_create__oid(void) /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_OID); + cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_DIRECT); cl_assert(reference_is_packed(looked_up_ref) == 0); cl_assert_equal_s(looked_up_ref->name, new_head); diff --git a/tests/refs/normalize.c b/tests/refs/normalize.c index c692eda77..6da005da0 100644 --- a/tests/refs/normalize.c +++ b/tests/refs/normalize.c @@ -29,83 +29,83 @@ static void ensure_refname_invalid(unsigned int flags, const char *input_refname void test_refs_normalize__can_normalize_a_direct_reference_name(void) { ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/dummy/a", "refs/dummy/a"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/dummy/a", "refs/dummy/a"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/stash", "refs/stash"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/stash", "refs/stash"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/tags/a", "refs/tags/a"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/tags/a", "refs/tags/a"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/a/b", "refs/heads/a/b"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a/b", "refs/heads/a/b"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/a./b", "refs/heads/a./b"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a./b", "refs/heads/a./b"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); + GIT_REFERENCE_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); } void test_refs_normalize__cannot_normalize_any_direct_reference_name(void) { ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "a"); + GIT_REFERENCE_FORMAT_NORMAL, "a"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "/a"); + GIT_REFERENCE_FORMAT_NORMAL, "/a"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "//a"); + GIT_REFERENCE_FORMAT_NORMAL, "//a"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, ""); + GIT_REFERENCE_FORMAT_NORMAL, ""); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "/refs/heads/a/"); + GIT_REFERENCE_FORMAT_NORMAL, "/refs/heads/a/"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a/"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a/"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a."); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a."); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a.lock"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a.lock"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo?bar"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo?bar"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads\foo"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads\foo"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); + GIT_REFERENCE_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/.a/b"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/.a/b"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo/../bar"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo/../bar"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo..bar"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo..bar"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/./foo"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/./foo"); ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@{ation"); + GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@{ation"); } void test_refs_normalize__symbolic(void) { ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ""); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, ""); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "heads\foo"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "heads\foo"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "/"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "/"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "///"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "///"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "ALL_CAPS_AND_UNDERSCORES", "ALL_CAPS_AND_UNDERSCORES"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "ALL_CAPS_AND_UNDERSCORES", "ALL_CAPS_AND_UNDERSCORES"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/MixedCasing", "refs/MixedCasing"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/MixedCasing", "refs/MixedCasing"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs///heads///a", "refs/heads/a"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs///heads///a", "refs/heads/a"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "HEAD", "HEAD"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "HEAD", "HEAD"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "MERGE_HEAD", "MERGE_HEAD"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "MERGE_HEAD", "MERGE_HEAD"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "FETCH_HEAD", "FETCH_HEAD"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "FETCH_HEAD", "FETCH_HEAD"); } /* Ported from JGit, BSD licence. @@ -146,47 +146,47 @@ void test_refs_normalize__symbolic(void) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + void test_refs_normalize__jgit_suite(void) { /* tests borrowed from JGit */ /* EmptyString */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ""); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, ""); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "/"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "/"); /* MustHaveTwoComponents */ ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "master"); + GIT_REFERENCE_FORMAT_NORMAL, "master"); ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "heads/master", "heads/master"); + GIT_REFERENCE_FORMAT_NORMAL, "heads/master", "heads/master"); /* ValidHead */ ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master", "refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master", "refs/heads/master"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/pu", "refs/heads/pu"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/pu", "refs/heads/pu"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/z", "refs/heads/z"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/z", "refs/heads/z"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/FoO", "refs/heads/FoO"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/FoO", "refs/heads/FoO"); /* ValidTag */ ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/tags/v1.0", "refs/tags/v1.0"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/tags/v1.0", "refs/tags/v1.0"); /* NoLockSuffix */ - ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master.lock"); + ensure_refname_invalid(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master.lock"); /* NoDirectorySuffix */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master/"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master/"); /* NoSpace */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/i haz space"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/i haz space"); /* NoAsciiControlCharacters */ { @@ -194,146 +194,146 @@ void test_refs_normalize__jgit_suite(void) char buffer[GIT_REFNAME_MAX]; for (c = '\1'; c < ' '; c++) { p_snprintf(buffer, sizeof(buffer), "refs/heads/mast%cer", c); - ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, buffer); + ensure_refname_invalid(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, buffer); } } /* NoBareDot */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/."); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/."); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.."); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/.."); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/./master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/./master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/../master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/../master"); /* NoLeadingOrTrailingDot */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "."); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "."); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.bar"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/.bar"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/..bar"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/..bar"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/bar."); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/bar."); /* ContainsDot */ ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/m.a.s.t.e.r", "refs/heads/m.a.s.t.e.r"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/m.a.s.t.e.r", "refs/heads/m.a.s.t.e.r"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master..pu"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master..pu"); /* NoMagicRefCharacters */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master^"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master^"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/^master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/^master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "^refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "^refs/heads/master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master~"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master~"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/~master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/~master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "~refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "~refs/heads/master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master:"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master:"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/:master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/:master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ":refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, ":refs/heads/master"); /* ShellGlob */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master?"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master?"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/?master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/?master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "?refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "?refs/heads/master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master["); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master["); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/[master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/[master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "[refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "[refs/heads/master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master*"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master*"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/*master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/*master"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "*refs/heads/master"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "*refs/heads/master"); /* ValidSpecialCharacters */ ensure_refname_normalized - (GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/!", "refs/heads/!"); + (GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/!", "refs/heads/!"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\"", "refs/heads/\""); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\"", "refs/heads/\""); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/#", "refs/heads/#"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/#", "refs/heads/#"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/$", "refs/heads/$"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/$", "refs/heads/$"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/%", "refs/heads/%"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/%", "refs/heads/%"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/&", "refs/heads/&"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/&", "refs/heads/&"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/'", "refs/heads/'"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/'", "refs/heads/'"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/(", "refs/heads/("); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/(", "refs/heads/("); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/)", "refs/heads/)"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/)", "refs/heads/)"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/+", "refs/heads/+"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/+", "refs/heads/+"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/,", "refs/heads/,"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/,", "refs/heads/,"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/-", "refs/heads/-"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/-", "refs/heads/-"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/;", "refs/heads/;"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/;", "refs/heads/;"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/<", "refs/heads/<"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/<", "refs/heads/<"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/=", "refs/heads/="); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/=", "refs/heads/="); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/>", "refs/heads/>"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/>", "refs/heads/>"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/@", "refs/heads/@"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/@", "refs/heads/@"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/]", "refs/heads/]"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/]", "refs/heads/]"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/_", "refs/heads/_"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/_", "refs/heads/_"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/`", "refs/heads/`"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/`", "refs/heads/`"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/{", "refs/heads/{"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/{", "refs/heads/{"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/|", "refs/heads/|"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/|", "refs/heads/|"); ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/}", "refs/heads/}"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/}", "refs/heads/}"); /* * This is valid on UNIX, but not on Windows * hence we make in invalid due to non-portability */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\\"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\\"); /* UnicodeNames */ /* * Currently this fails. - * ensure_refname_normalized(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\u00e5ngstr\u00f6m", "refs/heads/\u00e5ngstr\u00f6m"); + * ensure_refname_normalized(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\u00e5ngstr\u00f6m", "refs/heads/\u00e5ngstr\u00f6m"); */ /* RefLogQueryIsValidRef */ ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1}"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1}"); ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1.hour.ago}"); + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1.hour.ago}"); } void test_refs_normalize__buffer_has_to_be_big_enough_to_hold_the_normalized_version(void) @@ -341,61 +341,61 @@ void test_refs_normalize__buffer_has_to_be_big_enough_to_hold_the_normalized_ver char buffer_out[21]; cl_git_pass(git_reference_normalize_name( - buffer_out, 21, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL)); + buffer_out, 21, "refs//heads///long///name", GIT_REFERENCE_FORMAT_NORMAL)); cl_git_fail(git_reference_normalize_name( - buffer_out, 20, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL)); + buffer_out, 20, "refs//heads///long///name", GIT_REFERENCE_FORMAT_NORMAL)); } #define ONE_LEVEL_AND_REFSPEC \ - GIT_REF_FORMAT_ALLOW_ONELEVEL \ - | GIT_REF_FORMAT_REFSPEC_PATTERN + GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL \ + | GIT_REFERENCE_FORMAT_REFSPEC_PATTERN void test_refs_normalize__refspec_pattern(void) { ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo"); ensure_refname_normalized( ONE_LEVEL_AND_REFSPEC, "FOO", "FOO"); ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/bar", "foo/bar"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/bar", "foo/bar"); ensure_refname_normalized( ONE_LEVEL_AND_REFSPEC, "foo/bar", "foo/bar"); ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo", "*/foo"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/foo", "*/foo"); ensure_refname_normalized( ONE_LEVEL_AND_REFSPEC, "*/foo", "*/foo"); ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/bar", "foo/*/bar"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/*/bar", "foo/*/bar"); ensure_refname_normalized( ONE_LEVEL_AND_REFSPEC, "foo/*/bar", "foo/*/bar"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*"); ensure_refname_normalized( ONE_LEVEL_AND_REFSPEC, "*", "*"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/*"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/*/*"); ensure_refname_invalid( ONE_LEVEL_AND_REFSPEC, "foo/*/*"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo/*"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/foo/*"); ensure_refname_invalid( ONE_LEVEL_AND_REFSPEC, "*/foo/*"); ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/*/foo"); + GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/*/foo"); ensure_refname_invalid( ONE_LEVEL_AND_REFSPEC, "*/*/foo"); } diff --git a/tests/refs/overwrite.c b/tests/refs/overwrite.c index 2e499b75e..1826b1257 100644 --- a/tests/refs/overwrite.c +++ b/tests/refs/overwrite.c @@ -33,7 +33,7 @@ void test_refs_overwrite__symbolic(void) /* Ensure it points to the right place*/ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC); cl_assert_equal_s(git_reference_symbolic_target(ref), ref_branch_name); git_reference_free(ref); @@ -44,7 +44,7 @@ void test_refs_overwrite__symbolic(void) /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC); cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); git_reference_free(ref); @@ -58,7 +58,7 @@ void test_refs_overwrite__object_id(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); @@ -67,7 +67,7 @@ void test_refs_overwrite__object_id(void) git_reference_free(ref); cl_git_pass(git_reference_lookup(&ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); @@ -90,7 +90,7 @@ void test_refs_overwrite__object_id_with_symbolic(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); @@ -102,7 +102,7 @@ void test_refs_overwrite__object_id_with_symbolic(void) /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC); cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); git_reference_free(ref); @@ -115,7 +115,7 @@ void test_refs_overwrite__symbolic_with_object_id(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); @@ -129,7 +129,7 @@ void test_refs_overwrite__symbolic_with_object_id(void) /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); cl_assert_equal_oid(&id, git_reference_target(ref)); git_reference_free(ref); diff --git a/tests/refs/read.c b/tests/refs/read.c index 5a1f554f0..1bbc38766 100644 --- a/tests/refs/read.c +++ b/tests/refs/read.c @@ -34,7 +34,7 @@ void test_refs_read__loose_tag(void) git_buf ref_name_from_tag_name = GIT_BUF_INIT; cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); + cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT); cl_assert(reference_is_packed(reference) == 0); cl_assert_equal_s(reference->name, loose_tag_ref_name); @@ -71,12 +71,12 @@ void test_refs_read__symbolic(void) git_oid id; cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); - cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(reference) & GIT_REFERENCE_SYMBOLIC); cl_assert(reference_is_packed(reference) == 0); cl_assert_equal_s(reference->name, GIT_HEAD_FILE); cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); + cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT); cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJECT_ANY)); cl_assert(object != NULL); @@ -99,12 +99,12 @@ void test_refs_read__nested_symbolic(void) git_oid id; cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name)); - cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(reference) & GIT_REFERENCE_SYMBOLIC); cl_assert(reference_is_packed(reference) == 0); cl_assert_equal_s(reference->name, head_tracker_sym_ref_name); cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); + cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT); cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJECT_ANY)); cl_assert(object != NULL); @@ -167,7 +167,7 @@ void test_refs_read__packed(void) git_object *object; cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); + cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT); cl_assert(reference_is_packed(reference)); cl_assert_equal_s(reference->name, packed_head_name); @@ -188,7 +188,7 @@ void test_refs_read__loose_first(void) cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name)); git_reference_free(reference); cl_git_pass(git_reference_lookup(&reference, g_repo, packed_test_head_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); + cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT); cl_assert(reference_is_packed(reference) == 0); cl_assert_equal_s(reference->name, packed_test_head_name); diff --git a/tests/refs/rename.c b/tests/refs/rename.c index 6ec8f65ea..9933bee1d 100644 --- a/tests/refs/rename.c +++ b/tests/refs/rename.c @@ -264,7 +264,7 @@ void test_refs_rename__overwrite(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); @@ -297,7 +297,7 @@ void test_refs_rename__prefix(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); @@ -330,7 +330,7 @@ void test_refs_rename__move_up(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); + cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); diff --git a/tests/refs/setter.c b/tests/refs/setter.c index 03c214618..b34c71eb5 100644 --- a/tests/refs/setter.c +++ b/tests/refs/setter.c @@ -27,12 +27,12 @@ void test_refs_setter__update_direct(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); + cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(test_ref) == GIT_REF_OID); + cl_assert(git_reference_type(test_ref) == GIT_REFERENCE_DIRECT); cl_git_pass(git_reference_set_target(&new_ref, test_ref, &id, NULL)); @@ -40,7 +40,7 @@ void test_refs_setter__update_direct(void) git_reference_free(new_ref); cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(test_ref) == GIT_REF_OID); + cl_assert(git_reference_type(test_ref) == GIT_REFERENCE_DIRECT); cl_assert_equal_oid(&id, git_reference_target(test_ref)); git_reference_free(test_ref); } @@ -50,7 +50,7 @@ void test_refs_setter__update_symbolic(void) git_reference *head, *new_head; cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC); cl_assert(strcmp(git_reference_symbolic_target(head), ref_master_name) == 0); cl_git_pass(git_reference_symbolic_set_target(&new_head, head, ref_test_name, NULL)); @@ -58,7 +58,7 @@ void test_refs_setter__update_symbolic(void) git_reference_free(head); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC); cl_assert(strcmp(git_reference_symbolic_target(head), ref_test_name) == 0); git_reference_free(head); } @@ -70,7 +70,7 @@ void test_refs_setter__cant_update_direct_with_symbolic(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); + cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); cl_git_fail(git_reference_symbolic_set_target(&new, ref, ref_name, NULL)); @@ -85,7 +85,7 @@ void test_refs_setter__cant_update_symbolic_with_direct(void) git_oid id; cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); + cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT); git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); diff --git a/tests/refs/update.c b/tests/refs/update.c index 403ea75b8..1c5127d9e 100644 --- a/tests/refs/update.c +++ b/tests/refs/update.c @@ -19,7 +19,7 @@ void test_refs_update__updating_the_target_of_a_symref_with_an_invalid_name_retu git_reference *head; cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head)); git_reference_free(head); cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create(&head, g_repo, GIT_HEAD_FILE, "refs/heads/inv@{id", 1, NULL)); diff --git a/tests/repo/init.c b/tests/repo/init.c index 2611f05c7..91b25a5f1 100644 --- a/tests/repo/init.c +++ b/tests/repo/init.c @@ -442,7 +442,7 @@ void test_repo_init__extended_1(void) cl_assert((S_ISGID & st.st_mode) == 0); cl_git_pass(git_reference_lookup(&ref, _repo, "HEAD")); - cl_assert(git_reference_type(ref) == GIT_REF_SYMBOLIC); + cl_assert(git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC); cl_assert_equal_s("refs/heads/development", git_reference_symbolic_target(ref)); git_reference_free(ref); |