New upstream version 1.3.0+dfsg.1

[libgit2.git] / tests / clone / nonetwork.c

diff --git a/tests/clone/nonetwork.c b/tests/clone/nonetwork.c
index e4794fc14b84c2cc25aba94f24f54a78a55b45fe..ec12fee18a13a7d963362c97d347f0388fa47fd7 100644 (file)
--- a/tests/clone/nonetwork.c
+++ b/tests/clone/nonetwork.c
@@ -1,8 +1,9 @@
 #include "clar_libgit2.h"
 
 #include "git2/clone.h"
+#include "../submodule/submodule_helpers.h"
 #include "remote.h"
-#include "fileops.h"
+#include "futils.h"
 #include "repository.h"
 
 #define LIVE_REPO_URL "git://github.com/libgit2/TestGitRepository"
@@ -15,7 +16,7 @@ static git_remote* g_remote;
 void test_clone_nonetwork__initialize(void)
 {
        git_checkout_options dummy_opts = GIT_CHECKOUT_OPTIONS_INIT;
-       git_remote_callbacks dummy_callbacks = GIT_REMOTE_CALLBACKS_INIT;
+       git_fetch_options dummy_fetch = GIT_FETCH_OPTIONS_INIT;
 
        g_repo = NULL;
 
@@ -23,7 +24,7 @@ void test_clone_nonetwork__initialize(void)
        g_options.version = GIT_CLONE_OPTIONS_VERSION;
        g_options.checkout_opts = dummy_opts;
        g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
-       g_options.remote_callbacks = dummy_callbacks;
+       g_options.fetch_opts = dummy_fetch;
 }
 
 void test_clone_nonetwork__cleanup(void)
@@ -152,11 +153,13 @@ void test_clone_nonetwork__can_prevent_the_checkout_of_a_standard_repo(void)
        cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt"));
        cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path)));
 
-       git_buf_free(&path);
+       git_buf_dispose(&path);
 }
 
 void test_clone_nonetwork__can_checkout_given_branch(void)
 {
+       git_reference *remote_head;
+
        g_options.checkout_branch = "test";
        cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
 
@@ -166,10 +169,16 @@ void test_clone_nonetwork__can_checkout_given_branch(void)
        cl_assert_equal_s(git_reference_name(g_ref), "refs/heads/test");
 
        cl_assert(git_path_exists("foo/readme.txt"));
+
+       cl_git_pass(git_reference_lookup(&remote_head, g_repo, "refs/remotes/origin/HEAD"));
+       cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(remote_head));
+       cl_assert_equal_s("refs/remotes/origin/master", git_reference_symbolic_target(remote_head));
+
+       git_reference_free(remote_head);
 }
 
 static int clone_cancel_fetch_transfer_progress_cb(
-       const git_transfer_progress *stats, void *data)
+       const git_indexer_progress *stats, void *data)
 {
        GIT_UNUSED(stats); GIT_UNUSED(data);
        return -54321;
@@ -179,7 +188,7 @@ void test_clone_nonetwork__can_cancel_clone_in_fetch(void)
 {
        g_options.checkout_branch = "test";
 
-       g_options.remote_callbacks.transfer_progress =
+       g_options.fetch_opts.callbacks.transfer_progress =
                clone_cancel_fetch_transfer_progress_cb;
 
        cl_git_fail_with(git_clone(
@@ -267,7 +276,7 @@ void test_clone_nonetwork__clone_tag_to_tree(void)
        memset(&entry, 0, sizeof(git_index_entry));
        entry.path = file_path;
        entry.mode = GIT_FILEMODE_BLOB;
-       cl_git_pass(git_odb_write(&entry.id, odb, file_content, strlen(file_content), GIT_OBJ_BLOB));
+       cl_git_pass(git_odb_write(&entry.id, odb, file_content, strlen(file_content), GIT_OBJECT_BLOB));
 
        cl_git_pass(git_index_add(index, &entry));
        cl_git_pass(git_index_write_tree_to(&tree_id, index, stage));
@@ -295,16 +304,19 @@ static void assert_correct_reflog(const char *name)
 {
        git_reflog *log;
        const git_reflog_entry *entry;
-       char expected_log_message[128] = {0};
+       git_buf expected_message = GIT_BUF_INIT;
 
-       sprintf(expected_log_message, "clone: from %s", cl_git_fixture_url("testrepo.git"));
+       git_buf_printf(&expected_message,
+               "clone: from %s", cl_git_fixture_url("testrepo.git"));
 
        cl_git_pass(git_reflog_read(&log, g_repo, name));
        cl_assert_equal_i(1, git_reflog_entrycount(log));
        entry = git_reflog_entry_byindex(log, 0);
-       cl_assert_equal_s(expected_log_message, git_reflog_entry_message(entry));
+       cl_assert_equal_s(expected_message.ptr, git_reflog_entry_message(entry));
 
        git_reflog_free(log);
+
+       git_buf_dispose(&expected_message);
 }
 
 void test_clone_nonetwork__clone_updates_reflog_properly(void)