diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
| commit | 64c5112188647fcbfbe2bbfb897abfbc21912ba8 (patch) | |
| tree | 5113408a049178d14664f72cc1666655783d95d5 /tests-clar/submodule/lookup.c | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| parent | ca94e031fa21787ae6336f0aada1b01b2dd22077 (diff) | |
| download | libgit2-64c5112188647fcbfbe2bbfb897abfbc21912ba8.tar.gz | |
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Diffstat (limited to 'tests-clar/submodule/lookup.c')
| -rw-r--r-- | tests-clar/submodule/lookup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests-clar/submodule/lookup.c b/tests-clar/submodule/lookup.c index 94eb19b5e..868b51e55 100644 --- a/tests-clar/submodule/lookup.c +++ b/tests-clar/submodule/lookup.c @@ -62,9 +62,9 @@ void test_submodule_lookup__accessors(void) cl_assert(git__suffixcmp(git_submodule_path(sm), "sm_unchanged") == 0); cl_assert(git__suffixcmp(git_submodule_url(sm), "/submod2_target") == 0); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); cl_assert(git_submodule_ignore(sm) == GIT_SUBMODULE_IGNORE_NONE); cl_assert(git_submodule_update(sm) == GIT_SUBMODULE_UPDATE_CHECKOUT); @@ -72,24 +72,24 @@ void test_submodule_lookup__accessors(void) cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); cl_assert_equal_s("sm_changed_head", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), "3d9386c507f6b093471a3e324085657a3c2b4247") == 0); cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_added_and_uncommited")); cl_assert_equal_s("sm_added_and_uncommited", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_submodule_head_oid(sm) == NULL); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_submodule_head_id(sm) == NULL); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_missing_commits")); cl_assert_equal_s("sm_missing_commits", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), "5e4963595a9774b90524d35a807169049de8ccad") == 0); } |