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 df7059fd5fac430c8908310ea82c47846acf2f1d..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);
@@ -54,7 +40,7 @@ void test_repo_head__set_head_Attaches_HEAD_to_un_unborn_branch_when_the_branch_
 {
        git_reference *head;
 
-       cl_git_pass(git_repository_set_head(repo, "refs/heads/doesnt/exist/yet", NULL, NULL));
+       cl_git_pass(git_repository_set_head(repo, "refs/heads/doesnt/exist/yet"));
 
        cl_assert_equal_i(false, git_repository_head_detached(repo));
 
@@ -63,19 +49,19 @@ void test_repo_head__set_head_Attaches_HEAD_to_un_unborn_branch_when_the_branch_
 
 void test_repo_head__set_head_Returns_ENOTFOUND_when_the_reference_doesnt_exist(void)
 {
-       cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head(repo, "refs/tags/doesnt/exist/yet", NULL, NULL));
+       cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head(repo, "refs/tags/doesnt/exist/yet"));
 }
 
 void test_repo_head__set_head_Fails_when_the_reference_points_to_a_non_commitish(void)
 {
-       cl_git_fail(git_repository_set_head(repo, "refs/tags/point_to_blob", NULL, NULL));
+       cl_git_fail(git_repository_set_head(repo, "refs/tags/point_to_blob"));
 }
 
 void test_repo_head__set_head_Attaches_HEAD_when_the_reference_points_to_a_branch(void)
 {
        git_reference *head;
 
-       cl_git_pass(git_repository_set_head(repo, "refs/heads/br2", NULL, NULL));
+       cl_git_pass(git_repository_set_head(repo, "refs/heads/br2"));
 
        cl_assert_equal_i(false, git_repository_head_detached(repo));
 
@@ -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);
@@ -102,7 +88,7 @@ static void assert_head_is_correctly_detached(void)
 
 void test_repo_head__set_head_Detaches_HEAD_when_the_reference_doesnt_point_to_a_branch(void)
 {
-       cl_git_pass(git_repository_set_head(repo, "refs/tags/test", NULL, NULL));
+       cl_git_pass(git_repository_set_head(repo, "refs/tags/test"));
 
        cl_assert_equal_i(true, git_repository_head_detached(repo));
 
@@ -115,7 +101,7 @@ void test_repo_head__set_head_detached_Return_ENOTFOUND_when_the_object_doesnt_e
 
        cl_git_pass(git_oid_fromstr(&oid, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"));
 
-       cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head_detached(repo, &oid, NULL, NULL));
+       cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head_detached(repo, &oid));
 }
 
 void test_repo_head__set_head_detached_Fails_when_the_object_isnt_a_commitish(void)
@@ -124,7 +110,7 @@ void test_repo_head__set_head_detached_Fails_when_the_object_isnt_a_commitish(vo
 
        cl_git_pass(git_revparse_single(&blob, repo, "point_to_blob"));
 
-       cl_git_fail(git_repository_set_head_detached(repo, git_object_id(blob), NULL, NULL));
+       cl_git_fail(git_repository_set_head_detached(repo, git_object_id(blob)));
 
        git_object_free(blob);
 }
@@ -134,9 +120,9 @@ 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), NULL, NULL));
+       cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag)));
 
        assert_head_is_correctly_detached();
 
@@ -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));
 
@@ -194,26 +180,3 @@ void test_repo_head__can_tell_if_an_unborn_head_is_detached(void)
 
        cl_assert_equal_i(false, git_repository_head_detached(repo));
 }
-
-void test_repo_head__setting_head_updates_reflog(void)
-{
-       git_reflog *log;
-       const git_reflog_entry *entry1, *entry2, *entry3;
-       git_object *tag;
-
-       cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", NULL, "message1"));
-       cl_git_pass(git_repository_set_head(repo, "refs/heads/unborn", NULL, "message2"));
-       cl_git_pass(git_revparse_single(&tag, repo, "tags/test"));
-       cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag), NULL, "message3"));
-
-       cl_git_pass(git_reflog_read(&log, repo, "HEAD"));
-       entry1 = git_reflog_entry_byindex(log, 2);
-       entry2 = git_reflog_entry_byindex(log, 1);
-       entry3 = git_reflog_entry_byindex(log, 0);
-       cl_assert_equal_s("message1", git_reflog_entry_message(entry1));
-       cl_assert_equal_s("message2", git_reflog_entry_message(entry2));
-       cl_assert_equal_s("message3", git_reflog_entry_message(entry3));
-
-       git_reflog_free(log);
-       git_object_free(tag);
-}