repo::open: remove dead code, free buffers

2 files changed, 277 insertions, 256 deletions

diff --git a/tests/repo/env.c b/tests/repo/env.c
new file mode 100644
index 000000000..5a89c0d49
--- /dev/null
+++ b/tests/repo/env.c
@@ -0,0 +1,277 @@
+#include "clar_libgit2.h"
+#include "fileops.h"
+#include "sysdir.h"
+#include <ctype.h>
+
+static void clear_git_env(void)
+{
+	cl_setenv("GIT_DIR", NULL);
+	cl_setenv("GIT_CEILING_DIRECTORIES", NULL);
+	cl_setenv("GIT_INDEX_FILE", NULL);
+	cl_setenv("GIT_NAMESPACE", NULL);
+	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
+	cl_setenv("GIT_WORK_TREE", NULL);
+	cl_setenv("GIT_COMMON_DIR", NULL);
+}
+
+void test_repo_env__initialize(void)
+{
+	clear_git_env();
+}
+
+void test_repo_env__cleanup(void)
+{
+	cl_git_sandbox_cleanup();
+
+	if (git_path_isdir("attr"))
+		git_futils_rmdir_r("attr", NULL, GIT_RMDIR_REMOVE_FILES);
+	if (git_path_isdir("testrepo.git"))
+		git_futils_rmdir_r("testrepo.git", NULL, GIT_RMDIR_REMOVE_FILES);
+	if (git_path_isdir("peeled.git"))
+		git_futils_rmdir_r("peeled.git", NULL, GIT_RMDIR_REMOVE_FILES);
+
+	clear_git_env();
+}
+
+static int GIT_FORMAT_PRINTF(2, 3) cl_setenv_printf(const char *name, const char *fmt, ...)
+{
+	int ret;
+	va_list args;
+	git_buf buf = GIT_BUF_INIT;
+
+	va_start(args, fmt);
+	cl_git_pass(git_buf_vprintf(&buf, fmt, args));
+	va_end(args);
+
+	ret = cl_setenv(name, git_buf_cstr(&buf));
+	git_buf_free(&buf);
+	return ret;
+}
+
+/* Helper functions for test_repo_open__env, passing through the file and line
+ * from the caller rather than those of the helper. The expression strings
+ * distinguish between the possible failures within the helper. */
+
+static void env_pass_(const char *path, const char *file, int line)
+{
+	git_repository *repo;
+	cl_git_pass_(git_repository_open_ext(NULL, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
+	cl_git_pass_(git_repository_open_ext(&repo, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
+	cl_assert_at_line(git__suffixcmp(git_repository_path(repo), "attr/.git/") == 0, file, line);
+	cl_assert_at_line(git__suffixcmp(git_repository_workdir(repo), "attr/") == 0, file, line);
+	cl_assert_at_line(!git_repository_is_bare(repo), file, line);
+	git_repository_free(repo);
+}
+#define env_pass(path) env_pass_((path), __FILE__, __LINE__)
+
+#define cl_git_fail_at_line(expr, file, line) clar__assert((expr) < 0, file, line, "Expected function call to fail: " #expr, NULL, 1)
+
+static void env_fail_(const char *path, const char *file, int line)
+{
+	git_repository *repo;
+	cl_git_fail_at_line(git_repository_open_ext(NULL, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
+	cl_git_fail_at_line(git_repository_open_ext(&repo, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
+}
+#define env_fail(path) env_fail_((path), __FILE__, __LINE__)
+
+static void env_cd_(
+	const char *path,
+	void (*passfail_)(const char *, const char *, int),
+	const char *file, int line)
+{
+	git_buf cwd_buf = GIT_BUF_INIT;
+	cl_git_pass(git_path_prettify_dir(&cwd_buf, ".", NULL));
+	cl_must_pass(p_chdir(path));
+	passfail_(NULL, file, line);
+	cl_must_pass(p_chdir(git_buf_cstr(&cwd_buf)));
+	git_buf_free(&cwd_buf);
+}
+#define env_cd_pass(path) env_cd_((path), env_pass_, __FILE__, __LINE__)
+#define env_cd_fail(path) env_cd_((path), env_fail_, __FILE__, __LINE__)
+
+static void env_check_objects_(bool a, bool t, bool p, const char *file, int line)
+{
+	git_repository *repo;
+	git_oid oid_a, oid_t, oid_p;
+	git_object *object;
+	cl_git_pass(git_oid_fromstr(&oid_a, "45141a79a77842c59a63229403220a4e4be74e3d"));
+	cl_git_pass(git_oid_fromstr(&oid_t, "1385f264afb75a56a5bec74243be9b367ba4ca08"));
+	cl_git_pass(git_oid_fromstr(&oid_p, "0df1a5865c8abfc09f1f2182e6a31be550e99f07"));
+	cl_git_pass_(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
+
+	if (a) {
+		cl_git_pass_(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), file, line);
+		git_object_free(object);
+	} else {
+		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), file, line);
+	}
+
+	if (t) {
+		cl_git_pass_(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), file, line);
+		git_object_free(object);
+	} else {
+		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), file, line);
+	}
+
+	if (p) {
+		cl_git_pass_(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), file, line);
+		git_object_free(object);
+	} else {
+		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), file, line);
+	}
+
+	git_repository_free(repo);
+}
+#define env_check_objects(a, t, t2) env_check_objects_((a), (t), (t2), __FILE__, __LINE__)
+
+void test_repo_env__open(void)
+{
+	git_repository *repo = NULL;
+	git_buf repo_dir_buf = GIT_BUF_INIT;
+	const char *repo_dir = NULL;
+	git_index *index = NULL;
+	const char *t_obj = "testrepo.git/objects";
+	const char *p_obj = "peeled.git/objects";
+
+	clear_git_env();
+
+	cl_fixture_sandbox("attr");
+	cl_fixture_sandbox("testrepo.git");
+	cl_fixture_sandbox("peeled.git");
+	cl_git_pass(p_rename("attr/.gitted", "attr/.git"));
+
+	cl_git_pass(git_path_prettify_dir(&repo_dir_buf, "attr", NULL));
+	repo_dir = git_buf_cstr(&repo_dir_buf);
+
+	/* GIT_DIR that doesn't exist */
+	cl_setenv("GIT_DIR", "does-not-exist");
+	env_fail(NULL);
+	/* Explicit start_path overrides GIT_DIR */
+	env_pass("attr");
+	env_pass("attr/.git");
+	env_pass("attr/sub");
+	env_pass("attr/sub/sub");
+
+	/* GIT_DIR with relative paths */
+	cl_setenv("GIT_DIR", "attr/.git");
+	env_pass(NULL);
+	cl_setenv("GIT_DIR", "attr");
+	env_fail(NULL);
+	cl_setenv("GIT_DIR", "attr/sub");
+	env_fail(NULL);
+	cl_setenv("GIT_DIR", "attr/sub/sub");
+	env_fail(NULL);
+
+	/* GIT_DIR with absolute paths */
+	cl_setenv_printf("GIT_DIR", "%s/.git", repo_dir);
+	env_pass(NULL);
+	cl_setenv("GIT_DIR", repo_dir);
+	env_fail(NULL);
+	cl_setenv_printf("GIT_DIR", "%s/sub", repo_dir);
+	env_fail(NULL);
+	cl_setenv_printf("GIT_DIR", "%s/sub/sub", repo_dir);
+	env_fail(NULL);
+	cl_setenv("GIT_DIR", NULL);
+
+	/* Searching from the current directory */
+	env_cd_pass("attr");
+	env_cd_pass("attr/.git");
+	env_cd_pass("attr/sub");
+	env_cd_pass("attr/sub/sub");
+
+	/* A ceiling directory blocks searches from ascending into that
+	 * directory, but doesn't block the start_path itself. */
+	cl_setenv("GIT_CEILING_DIRECTORIES", repo_dir);
+	env_cd_pass("attr");
+	env_cd_fail("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s/sub", repo_dir);
+	env_cd_pass("attr");
+	env_cd_pass("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	/* Multiple ceiling directories */
+	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "123%c%s/sub%cabc",
+		GIT_PATH_LIST_SEPARATOR, repo_dir, GIT_PATH_LIST_SEPARATOR);
+	env_cd_pass("attr");
+	env_cd_pass("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s%c%s/sub",
+		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
+	env_cd_pass("attr");
+	env_cd_fail("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s/sub%c%s",
+		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
+	env_cd_pass("attr");
+	env_cd_fail("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s%c%s/sub/sub",
+		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
+	env_cd_pass("attr");
+	env_cd_fail("attr/sub");
+	env_cd_fail("attr/sub/sub");
+
+	cl_setenv("GIT_CEILING_DIRECTORIES", NULL);
+
+	/* Index files */
+	cl_setenv("GIT_INDEX_FILE", cl_fixture("gitgit.index"));
+	cl_git_pass(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL));
+	cl_git_pass(git_repository_index(&index, repo));
+	cl_assert_equal_s(git_index_path(index), cl_fixture("gitgit.index"));
+	cl_assert_equal_i(git_index_entrycount(index), 1437);
+	git_index_free(index);
+	git_repository_free(repo);
+	cl_setenv("GIT_INDEX_FILE", NULL);
+
+	/* Namespaces */
+	cl_setenv("GIT_NAMESPACE", "some-namespace");
+	cl_git_pass(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL));
+	cl_assert_equal_s(git_repository_get_namespace(repo), "some-namespace");
+	git_repository_free(repo);
+	cl_setenv("GIT_NAMESPACE", NULL);
+
+	/* Object directories and alternates */
+	env_check_objects(true, false, false);
+
+	cl_setenv("GIT_OBJECT_DIRECTORY", t_obj);
+	env_check_objects(false, true, false);
+	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
+
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", t_obj);
+	env_check_objects(true, true, false);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
+
+	cl_setenv("GIT_OBJECT_DIRECTORY", p_obj);
+	env_check_objects(false, false, true);
+	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
+
+	cl_setenv("GIT_OBJECT_DIRECTORY", t_obj);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", p_obj);
+	env_check_objects(false, true, true);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
+	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
+
+	cl_setenv_printf("GIT_ALTERNATE_OBJECT_DIRECTORIES",
+			"%s%c%s", t_obj, GIT_PATH_LIST_SEPARATOR, p_obj);
+	env_check_objects(true, true, true);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
+
+	cl_setenv_printf("GIT_ALTERNATE_OBJECT_DIRECTORIES",
+			"%s%c%s", p_obj, GIT_PATH_LIST_SEPARATOR, t_obj);
+	env_check_objects(true, true, true);
+	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
+
+	cl_fixture_cleanup("peeled.git");
+	cl_fixture_cleanup("testrepo.git");
+	cl_fixture_cleanup("attr");
+
+	git_buf_free(&repo_dir_buf);
+
+	clear_git_env();
+}
diff --git a/tests/repo/open.c b/tests/repo/open.c
index 86353dd25..6114ad2e1 100644
--- a/tests/repo/open.c
+++ b/tests/repo/open.c
@@ -3,26 +3,6 @@
 #include "sysdir.h"
 #include <ctype.h>
 
-static void clear_git_env(void)
-{
-	cl_setenv("GIT_DIR", NULL);
-	cl_setenv("GIT_CEILING_DIRECTORIES", NULL);
-	cl_setenv("GIT_INDEX_FILE", NULL);
-	cl_setenv("GIT_NAMESPACE", NULL);
-	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
-	cl_setenv("GIT_WORK_TREE", NULL);
-	cl_setenv("GIT_COMMON_DIR", NULL);
-}
-
-static git_buf cwd_backup_buf = GIT_BUF_INIT;
-
-void test_repo_open__initialize(void)
-{
-	if (!git_buf_is_allocated(&cwd_backup_buf))
-		cl_git_pass(git_path_prettify_dir(&cwd_backup_buf, ".", NULL));
-	clear_git_env();
-}
 
 void test_repo_open__cleanup(void)
 {
@@ -30,15 +10,6 @@ void test_repo_open__cleanup(void)
 
 	if (git_path_isdir("alternate"))
 		git_futils_rmdir_r("alternate", NULL, GIT_RMDIR_REMOVE_FILES);
-	if (git_path_isdir("attr"))
-		git_futils_rmdir_r("attr", NULL, GIT_RMDIR_REMOVE_FILES);
-	if (git_path_isdir("testrepo.git"))
-		git_futils_rmdir_r("testrepo.git", NULL, GIT_RMDIR_REMOVE_FILES);
-	if (git_path_isdir("peeled.git"))
-		git_futils_rmdir_r("peeled.git", NULL, GIT_RMDIR_REMOVE_FILES);
-
-	cl_must_pass(p_chdir(git_buf_cstr(&cwd_backup_buf)));
-	clear_git_env();
 }
 
 void test_repo_open__bare_empty_repo(void)
@@ -432,230 +403,3 @@ void test_repo_open__force_bare(void)
 	git_repository_free(barerepo);
 }
 
-static int GIT_FORMAT_PRINTF(2, 3) cl_setenv_printf(const char *name, const char *fmt, ...)
-{
-	int ret;
-	va_list args;
-	git_buf buf = GIT_BUF_INIT;
-
-	va_start(args, fmt);
-	cl_git_pass(git_buf_vprintf(&buf, fmt, args));
-	va_end(args);
-
-	ret = cl_setenv(name, git_buf_cstr(&buf));
-	git_buf_free(&buf);
-	return ret;
-}
-
-/* Helper functions for test_repo_open__env, passing through the file and line
- * from the caller rather than those of the helper. The expression strings
- * distinguish between the possible failures within the helper. */
-
-static void env_pass_(const char *path, const char *file, int line)
-{
-	git_repository *repo;
-	cl_git_pass_(git_repository_open_ext(NULL, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
-	cl_git_pass_(git_repository_open_ext(&repo, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
-	cl_assert_at_line(git__suffixcmp(git_repository_path(repo), "attr/.git/") == 0, file, line);
-	cl_assert_at_line(git__suffixcmp(git_repository_workdir(repo), "attr/") == 0, file, line);
-	cl_assert_at_line(!git_repository_is_bare(repo), file, line);
-	git_repository_free(repo);
-}
-#define env_pass(path) env_pass_((path), __FILE__, __LINE__)
-
-#define cl_git_fail_at_line(expr, file, line) clar__assert((expr) < 0, file, line, "Expected function call to fail: " #expr, NULL, 1)
-
-static void env_fail_(const char *path, const char *file, int line)
-{
-	git_repository *repo;
-	cl_git_fail_at_line(git_repository_open_ext(NULL, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
-	cl_git_fail_at_line(git_repository_open_ext(&repo, path, GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
-}
-#define env_fail(path) env_fail_((path), __FILE__, __LINE__)
-
-static void env_cd_(
-	const char *path,
-	void (*passfail_)(const char *, const char *, int),
-	const char *file, int line)
-{
-	git_buf cwd_buf = GIT_BUF_INIT;
-	cl_git_pass(git_path_prettify_dir(&cwd_buf, ".", NULL));
-	cl_must_pass(p_chdir(path));
-	passfail_(NULL, file, line);
-	cl_must_pass(p_chdir(git_buf_cstr(&cwd_buf)));
-}
-#define env_cd_pass(path) env_cd_((path), env_pass_, __FILE__, __LINE__)
-#define env_cd_fail(path) env_cd_((path), env_fail_, __FILE__, __LINE__)
-
-static void env_check_objects_(bool a, bool t, bool p, const char *file, int line)
-{
-	git_repository *repo;
-	git_oid oid_a, oid_t, oid_p;
-	git_object *object;
-	cl_git_pass(git_oid_fromstr(&oid_a, "45141a79a77842c59a63229403220a4e4be74e3d"));
-	cl_git_pass(git_oid_fromstr(&oid_t, "1385f264afb75a56a5bec74243be9b367ba4ca08"));
-	cl_git_pass(git_oid_fromstr(&oid_p, "0df1a5865c8abfc09f1f2182e6a31be550e99f07"));
-	cl_git_pass_(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL), file, line);
-	if (a) {
-		cl_git_pass_(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), file, line);
-		git_object_free(object);
-	} else
-		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), file, line);
-	if (t) {
-		cl_git_pass_(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), file, line);
-		git_object_free(object);
-	} else
-		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), file, line);
-	if (p) {
-		cl_git_pass_(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), file, line);
-		git_object_free(object);
-	} else
-		cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), file, line);
-	git_repository_free(repo);
-}
-#define env_check_objects(a, t, t2) env_check_objects_((a), (t), (t2), __FILE__, __LINE__)
-
-void test_repo_open__env(void)
-{
-	git_repository *repo = NULL;
-	git_buf repo_dir_buf = GIT_BUF_INIT;
-	const char *repo_dir = NULL;
-	git_index *index = NULL;
-	const char *t_obj = "testrepo.git/objects";
-	const char *p_obj = "peeled.git/objects";
-
-	cl_fixture_sandbox("attr");
-	cl_fixture_sandbox("testrepo.git");
-	cl_fixture_sandbox("peeled.git");
-	cl_git_pass(p_rename("attr/.gitted", "attr/.git"));
-
-	cl_git_pass(git_path_prettify_dir(&repo_dir_buf, "attr", NULL));
-	repo_dir = git_buf_cstr(&repo_dir_buf);
-
-	/* GIT_DIR that doesn't exist */
-	cl_setenv("GIT_DIR", "does-not-exist");
-	env_fail(NULL);
-	/* Explicit start_path overrides GIT_DIR */
-	env_pass("attr");
-	env_pass("attr/.git");
-	env_pass("attr/sub");
-	env_pass("attr/sub/sub");
-
-	/* GIT_DIR with relative paths */
-	cl_setenv("GIT_DIR", "attr/.git");
-	env_pass(NULL);
-	cl_setenv("GIT_DIR", "attr");
-	env_fail(NULL);
-	cl_setenv("GIT_DIR", "attr/sub");
-	env_fail(NULL);
-	cl_setenv("GIT_DIR", "attr/sub/sub");
-	env_fail(NULL);
-
-        /* GIT_DIR with absolute paths */
-	cl_setenv_printf("GIT_DIR", "%s/.git", repo_dir);
-	env_pass(NULL);
-	cl_setenv("GIT_DIR", repo_dir);
-	env_fail(NULL);
-	cl_setenv_printf("GIT_DIR", "%s/sub", repo_dir);
-	env_fail(NULL);
-	cl_setenv_printf("GIT_DIR", "%s/sub/sub", repo_dir);
-	env_fail(NULL);
-	cl_setenv("GIT_DIR", NULL);
-
-	/* Searching from the current directory */
-	env_cd_pass("attr");
-	env_cd_pass("attr/.git");
-	env_cd_pass("attr/sub");
-	env_cd_pass("attr/sub/sub");
-
-	/* A ceiling directory blocks searches from ascending into that
-	 * directory, but doesn't block the start_path itself. */
-	cl_setenv("GIT_CEILING_DIRECTORIES", repo_dir);
-	env_cd_pass("attr");
-	env_cd_fail("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s/sub", repo_dir);
-	env_cd_pass("attr");
-	env_cd_pass("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-        /* Multiple ceiling directories */
-	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "123%c%s/sub%cabc",
-		GIT_PATH_LIST_SEPARATOR, repo_dir, GIT_PATH_LIST_SEPARATOR);
-	env_cd_pass("attr");
-	env_cd_pass("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s%c%s/sub",
-		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
-	env_cd_pass("attr");
-	env_cd_fail("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s/sub%c%s",
-		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
-	env_cd_pass("attr");
-	env_cd_fail("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-	cl_setenv_printf("GIT_CEILING_DIRECTORIES", "%s%c%s/sub/sub",
-		repo_dir, GIT_PATH_LIST_SEPARATOR, repo_dir);
-	env_cd_pass("attr");
-	env_cd_fail("attr/sub");
-	env_cd_fail("attr/sub/sub");
-
-	cl_setenv("GIT_CEILING_DIRECTORIES", NULL);
-
-        /* Index files */
-	cl_setenv("GIT_INDEX_FILE", cl_fixture("gitgit.index"));
-	cl_git_pass(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL));
-	cl_git_pass(git_repository_index(&index, repo));
-	cl_assert_equal_s(git_index_path(index), cl_fixture("gitgit.index"));
-	cl_assert_equal_i(git_index_entrycount(index), 1437);
-	git_index_free(index);
-	git_repository_free(repo);
-	cl_setenv("GIT_INDEX_FILE", NULL);
-
-        /* Namespaces */
-	cl_setenv("GIT_NAMESPACE", "some-namespace");
-	cl_git_pass(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL));
-	cl_assert_equal_s(git_repository_get_namespace(repo), "some-namespace");
-	git_repository_free(repo);
-	cl_setenv("GIT_NAMESPACE", NULL);
-
-        /* Object directories and alternates */
-	env_check_objects(true, false, false);
-
-	cl_setenv("GIT_OBJECT_DIRECTORY", t_obj);
-	env_check_objects(false, true, false);
-	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
-
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", t_obj);
-	env_check_objects(true, true, false);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
-
-	cl_setenv("GIT_OBJECT_DIRECTORY", p_obj);
-	env_check_objects(false, false, true);
-	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
-
-	cl_setenv("GIT_OBJECT_DIRECTORY", t_obj);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", p_obj);
-	env_check_objects(false, true, true);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
-	cl_setenv("GIT_OBJECT_DIRECTORY", NULL);
-
-	cl_setenv_printf("GIT_ALTERNATE_OBJECT_DIRECTORIES",
-			"%s%c%s", t_obj, GIT_PATH_LIST_SEPARATOR, p_obj);
-	env_check_objects(true, true, true);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
-
-	cl_setenv_printf("GIT_ALTERNATE_OBJECT_DIRECTORIES",
-			"%s%c%s", p_obj, GIT_PATH_LIST_SEPARATOR, t_obj);
-	env_check_objects(true, true, true);
-	cl_setenv("GIT_ALTERNATE_OBJECT_DIRECTORIES", NULL);
-
-	cl_fixture_cleanup("peeled.git");
-	cl_fixture_cleanup("testrepo.git");
-	cl_fixture_cleanup("attr");
-}