Merge pull request #1097 from nulltoken/topic/head_tree_error

Make `git_repository_head_tree()` return error codes

2 files changed, 56 insertions, 3 deletions

diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c
index 23d14d619..1c1e905c4 100644
--- a/tests-clar/repo/head.c
+++ b/tests-clar/repo/head.c
@@ -19,9 +19,9 @@ void test_repo_head__head_detached(void)
 {
 	git_reference *ref;
 
-	cl_assert(git_repository_head_detached(repo) == 0);
+	cl_git_pass(git_repository_head_detached(repo));
 
-	git_repository_detach_head(repo);
+	cl_git_pass(git_repository_detach_head(repo));
 
 	cl_assert_equal_i(true, git_repository_head_detached(repo));
 
@@ -36,7 +36,7 @@ void test_repo_head__head_orphan(void)
 {
 	git_reference *ref;
 
-	cl_assert(git_repository_head_orphan(repo) == 0);
+	cl_git_pass(git_repository_head_detached(repo));
 
 	make_head_orphaned(repo, NON_EXISTING_HEAD);
 
diff --git a/tests-clar/repo/headtree.c b/tests-clar/repo/headtree.c
new file mode 100644
index 000000000..0e7fe93e5
--- /dev/null
+++ b/tests-clar/repo/headtree.c
@@ -0,0 +1,53 @@
+#include "clar_libgit2.h"
+#include "repository.h"
+#include "repo_helpers.h"
+#include "posix.h"
+
+static git_repository *repo;
+static git_tree *tree;
+
+void test_repo_headtree__initialize(void)
+{
+	repo = cl_git_sandbox_init("testrepo.git");
+	tree = NULL;
+}
+
+void test_repo_headtree__cleanup(void)
+{
+	git_tree_free(tree);
+	cl_git_sandbox_cleanup();
+}
+
+void test_repo_headtree__can_retrieve_the_root_tree_from_a_detached_head(void)
+{
+	cl_git_pass(git_repository_detach_head(repo));
+
+	cl_git_pass(git_repository_head_tree(&tree, repo));
+
+	cl_assert(git_oid_streq(git_tree_id(tree), "az"));
+}
+
+void test_repo_headtree__can_retrieve_the_root_tree_from_a_non_detached_head(void)
+{
+	cl_assert_equal_i(false, git_repository_head_detached(repo));
+
+	cl_git_pass(git_repository_head_tree(&tree, repo));
+
+	cl_assert(git_oid_streq(git_tree_id(tree), "az"));
+}
+
+void test_repo_headtree__when_head_is_orphaned_returns_EORPHANEDHEAD(void)
+{
+	make_head_orphaned(repo, NON_EXISTING_HEAD);
+
+	cl_assert_equal_i(true, git_repository_head_orphan(repo));
+
+	cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_head_tree(&tree, repo));
+}
+
+void test_repo_headtree__when_head_is_missing_returns_ENOTFOUND(void)
+{
+	delete_head(repo);
+
+	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_head_tree(&tree, repo));
+}