thodg/libgit2

diff --git a/tests/index/crlf.c b/tests/index/crlf.c
index 23f4793..6544d9b 100644
--- a/tests/index/crlf.c
+++ b/tests/index/crlf.c
@@ -14,9 +14,11 @@
 static git_repository *g_repo;
 static git_index *g_index;
 
+static git_buf expected_fixture = GIT_BUF_INIT;
+
 void test_index_crlf__initialize(void)
 {
-	g_repo = cl_git_sandbox_init("crlf");
+	g_repo = cl_git_sandbox_init_new("crlf");
 	cl_git_pass(git_repository_index(&g_index, g_repo));
 }
 
@@ -24,6 +26,209 @@ void test_index_crlf__cleanup(void)
 {
 	git_index_free(g_index);
 	cl_git_sandbox_cleanup();
+
+	if (expected_fixture.size) {
+		cl_fixture_cleanup(expected_fixture.ptr);
+		git_buf_free(&expected_fixture);
+	}
+}
+
+struct compare_data
+{
+	const char *dirname;
+	const char *safecrlf;
+	const char *autocrlf;
+	const char *attrs;
+};
+
+static int add_and_check_file(void *payload, git_buf *actual_path)
+{
+	git_buf expected_path_oid = GIT_BUF_INIT;
+	git_buf expected_path_fail = GIT_BUF_INIT;
+	git_buf expected_contents = GIT_BUF_INIT;
+	struct compare_data *cd = payload;
+	bool failed = true;
+	int cmp_git, cmp_gitattributes;
+	char *basename;
+	int add_bypath_ret;
+	const git_index_entry *entry;
+	git_oid oid;
+	git_error_state error = { 0 };
+
+	basename = git_path_basename(actual_path->ptr);
+	cmp_git = strcmp(basename, ".git");
+	cmp_gitattributes = strcmp(basename, ".gitattributes");
+
+	if (cmp_git == 0 || cmp_gitattributes == 0) {
+		failed = false;
+		goto done;
+	}
+
+	giterr_clear();
+	add_bypath_ret = git_index_add_bypath(g_index, basename);
+	giterr_state_capture(&error, add_bypath_ret);
+
+	entry = git_index_get_bypath(g_index, basename, 0);
+	if (!add_bypath_ret && !entry)
+		goto done;
+
+	cl_git_pass(git_buf_joinpath(&expected_path_oid, cd->dirname, basename));
+	cl_git_pass(git_buf_joinpath(&expected_path_fail, cd->dirname, basename));
+	git_buf_puts(&expected_path_oid, ".obj");
+	git_buf_puts(&expected_path_fail, ".fail");
+
+	if (git_path_isfile(expected_path_oid.ptr)) {
+		if (add_bypath_ret)
+			goto done;
+
+		if (git_futils_readbuffer(&expected_contents, expected_path_oid.ptr) < 0)
+			goto done;
+
+		if (git_oid_fromstr(&oid, expected_contents.ptr))
+			goto done;
+		if (!git_oid_equal(&oid, &entry->id))
+			goto done;
+	}
+
+	if (git_path_isfile(expected_path_fail.ptr)) {
+		if (!add_bypath_ret)
+			goto done;
+
+		if (git_futils_readbuffer(&expected_contents, expected_path_fail.ptr) < 0)
+			goto done;
+
+		git_buf_rtrim(&expected_contents);
+
+		if (error.error_msg.klass != GITERR_FILTER || strstr(error.error_msg.message, expected_contents.ptr) == NULL)
+			goto done;
+	}
+
+	failed = false;
+
+done:
+	if (failed) {
+		git_buf details = GIT_BUF_INIT;
+		git_buf_printf(&details, "filename=%s, safecrlf=%s, autocrlf=%s, attrs={%s}",
+			git_path_basename(actual_path->ptr), cd->safecrlf, cd->autocrlf, cd->attrs);
+		clar__fail(__FILE__, __LINE__,
+			"adding file did not work as expected", details.ptr, 0);
+		git_buf_free(&details);
+	}
+
+	git__free(basename);
+	git_buf_free(&expected_contents);
+	git_buf_free(&expected_path_oid);
+	git_buf_free(&expected_path_fail);
+	giterr_state_free(&error);
+
+	return 0;
+}
+
+static void test_add_index(const char *safecrlf, const char *autocrlf, const char *attrs)
+{
+	git_buf attrbuf = GIT_BUF_INIT;
+	git_buf expected_dirname = GIT_BUF_INIT;
+	git_buf sandboxname = GIT_BUF_INIT;
+	git_buf reponame = GIT_BUF_INIT;
+	struct compare_data compare_data = { NULL, safecrlf, autocrlf, attrs };
+	const char *c;
+
+	git_buf_puts(&reponame, "crlf");
+
+	git_buf_puts(&sandboxname, "safecrlf_");
+	git_buf_puts(&sandboxname, safecrlf);
+
+	git_buf_puts(&sandboxname, ",autocrlf_");
+	git_buf_puts(&sandboxname, autocrlf);
+
+	if (*attrs) {
+		git_buf_puts(&sandboxname, ",");
+
+		for (c = attrs; *c; c++) {
+			if (*c == ' ')
+				git_buf_putc(&sandboxname, ',');
+			else if (*c == '=')
+				git_buf_putc(&sandboxname, '_');
+			else
+				git_buf_putc(&sandboxname, *c);
+		}
+
+		git_buf_printf(&attrbuf, "* %s\n", attrs);
+		cl_git_mkfile("crlf/.gitattributes", attrbuf.ptr);
+	}
+
+	cl_repo_set_string(g_repo, "core.safecrlf", safecrlf);
+	cl_repo_set_string(g_repo, "core.autocrlf", autocrlf);
+
+	cl_git_pass(git_index_clear(g_index));
+
+	git_buf_joinpath(&expected_dirname, "crlf_data", "checkin_results");
+	git_buf_joinpath(&expected_fixture, expected_dirname.ptr, sandboxname.ptr);
+	cl_fixture_sandbox(expected_fixture.ptr);
+
+	compare_data.dirname = sandboxname.ptr;
+	cl_git_pass(git_path_direach(&reponame, 0, add_and_check_file, &compare_data));
+
+	cl_fixture_cleanup(expected_fixture.ptr);
+	git_buf_free(&expected_fixture);
+
+	git_buf_free(&attrbuf);
+	git_buf_free(&expected_fixture);
+	git_buf_free(&expected_dirname);
+	git_buf_free(&sandboxname);
+	git_buf_free(&reponame);
+}
+
+static void set_up_workingdir(const char *name)
+{
+	git_vector contents = GIT_VECTOR_INIT;
+	size_t i;
+	const char *fn;
+
+	git_path_dirload(&contents, name, 0, 0);
+	git_vector_foreach(&contents, i, fn) {
+		char *basename = git_path_basename(fn);
+		bool skip = strncasecmp(basename, ".git", 4) == 0 && strlen(basename) == 4;
+
+		git__free(basename);
+
+		if (skip)
+			continue;
+		p_unlink(fn);
+	}
+	git_vector_free_deep(&contents);
+
+	/* copy input files */
+	git_path_dirload(&contents, cl_fixture("crlf_data/checkin_input_files"), 0, 0);
+	git_vector_foreach(&contents, i, fn) {
+		char *basename = git_path_basename(fn);
+		git_buf dest_filename = GIT_BUF_INIT;
+		git_buf_joinpath(&dest_filename, name, basename);
+		git__free(basename);
+		cl_git_pass(git_futils_cp(fn, dest_filename.ptr, 0644));
+		git_buf_free(&dest_filename);
+	}
+	git_vector_free_deep(&contents);
+}
+
+void test_index_crlf__matches_core_git(void)
+{
+	const char *safecrlf[] = { "true", "false", "warn", NULL };
+	const char *autocrlf[] = { "true", "false", "input", NULL };
+	const char *attrs[] = { "", "-crlf", "-text", "eol=crlf", "eol=lf",
+		"text", "text eol=crlf", "text eol=lf",
+		"text=auto", "text=auto eol=crlf", "text=auto eol=lf", 
+		NULL };
+	const char **a, **b, **c;
+
+	for (a = safecrlf; *a; a++) {
+		for (b = autocrlf; *b; b++) {
+			for (c = attrs; *c; c++) {
+				set_up_workingdir("crlf");
+				test_add_index(*a, *b, *c);
+			}
+		}
+	}
 }
 
 void test_index_crlf__autocrlf_false_no_attrs(void)