New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / repo / head.c

diff --git a/tests/repo/head.c b/tests/repo/head.c
index 101e30f1059b6f76620446aed8c240ad3dc65028..8229905559641d4b20990fa89ee17f0cce9ae95f 100644 (file)
--- a/tests/repo/head.c
+++ b/tests/repo/head.c
@@ -2,12 +2,15 @@
 #include "refs.h"
 #include "repo_helpers.h"
 #include "posix.h"
+#include "git2/annotated_commit.h"
 
+static const char *g_email = "foo@example.com";
 static git_repository *repo;
 
 void test_repo_head__initialize(void)
 {
        repo = cl_git_sandbox_init("testrepo.git");
+       cl_git_pass(git_repository_set_ident(repo, "Foo Bar", g_email));
 }
 
 void test_repo_head__cleanup(void)
@@ -15,23 +18,6 @@ void test_repo_head__cleanup(void)
        cl_git_sandbox_cleanup();
 }
 
-void test_repo_head__head_detached(void)
-{
-       git_reference *ref;
-
-       cl_git_pass(git_repository_head_detached(repo));
-
-       cl_git_pass(git_repository_detach_head(repo));
-
-       cl_assert_equal_i(true, git_repository_head_detached(repo));
-
-       /* take the reop back to it's original state */
-       cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1, NULL, NULL));
-       git_reference_free(ref);
-
-       cl_assert_equal_i(false, git_repository_head_detached(repo));
-}
-
 void test_repo_head__unborn_head(void)
 {
        git_reference *ref;
@@ -44,7 +30,7 @@ void test_repo_head__unborn_head(void)
 
 
        /* take the repo back to it's original state */
-       cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1, NULL, NULL));
+       cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1, NULL));
        cl_assert(git_repository_head_unborn(repo) == 0);
 
        git_reference_free(ref);
@@ -94,7 +80,7 @@ static void assert_head_is_correctly_detached(void)
 
        cl_git_pass(git_repository_head(&head, repo));
 
-       cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJ_COMMIT));
+       cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJECT_COMMIT));
 
        git_object_free(commit);
        git_reference_free(head);
@@ -134,7 +120,7 @@ void test_repo_head__set_head_detached_Detaches_HEAD_and_make_it_point_to_the_pe
        git_object *tag;
 
        cl_git_pass(git_revparse_single(&tag, repo, "tags/test"));
-       cl_assert_equal_i(GIT_OBJ_TAG, git_object_type(tag));
+       cl_assert_equal_i(GIT_OBJECT_TAG, git_object_type(tag));
 
        cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag)));
 
@@ -156,7 +142,7 @@ void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void
 {
        git_reference *head;
 
-       cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1, NULL, NULL));
+       cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1, NULL));
 
        cl_git_fail(git_repository_detach_head(repo));