rugged 0.17.0b2 → 0.17.0.b6

data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/patch.c

@@ -1,99 +0,0 @@
-#include "clar_libgit2.h"
-#include "diff_helpers.h"
-
-static git_repository *g_repo = NULL;
-
-void test_diff_patch__initialize(void)
-{
-	g_repo = cl_git_sandbox_init("status");
-}
-
-void test_diff_patch__cleanup(void)
-{
-	cl_git_sandbox_cleanup();
-}
-
-#define EXPECTED_HEADER "diff --git a/subdir.txt b/subdir.txt\n" \
-	"deleted file mode 100644\n" \
-	"index e8ee89e..0000000\n" \
-	"--- a/subdir.txt\n" \
-	"+++ /dev/null\n"
-
-#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n"
-
-static int check_removal_cb(
-	void *cb_data,
-	git_diff_delta *delta,
-	git_diff_range *range,
-	char line_origin,
-	const char *formatted_output,
-	size_t output_len)
-{
-	GIT_UNUSED(cb_data);
-	GIT_UNUSED(output_len);
-
-	switch (line_origin) {
-	case GIT_DIFF_LINE_FILE_HDR:
-		cl_assert_equal_s(EXPECTED_HEADER, formatted_output);
-		cl_assert(range == NULL);
-		goto check_delta;
-
-	case GIT_DIFF_LINE_HUNK_HDR:
-		cl_assert_equal_s(EXPECTED_HUNK, formatted_output);
-		/* Fall through */
-
-	case GIT_DIFF_LINE_CONTEXT:
-	case GIT_DIFF_LINE_DELETION:
-		goto check_range;
-
-	default:
-		/* unexpected code path */
-		return -1;
-	}
-
-check_range:
-	cl_assert(range != NULL);
-	cl_assert_equal_i(1, range->old_start);
-	cl_assert_equal_i(2, range->old_lines);
-	cl_assert_equal_i(0, range->new_start);
-	cl_assert_equal_i(0, range->new_lines);
-
-check_delta:
-	cl_assert_equal_s("subdir.txt", delta->old_file.path);
-	cl_assert_equal_s("subdir.txt", delta->new_file.path);
-	cl_assert_equal_i(GIT_DELTA_DELETED, delta->status);
-
-	return 0;
-}
-
-void test_diff_patch__can_properly_display_the_removal_of_a_file(void)
-{
-	/*
-	* $ git diff 26a125e..735b6a2
-	* diff --git a/subdir.txt b/subdir.txt
-	* deleted file mode 100644
-	* index e8ee89e..0000000
-	* --- a/subdir.txt
-	* +++ /dev/null
-	* @@ -1,2 +0,0 @@
-	* -Is it a bird?
-	* -Is it a plane?
-	*/
-
-	const char *one_sha = "26a125e";
-	const char *another_sha = "735b6a2";
-	git_tree *one, *another;
-	git_diff_list *diff;
-
-	one = resolve_commit_oid_to_tree(g_repo, one_sha);
-	another = resolve_commit_oid_to_tree(g_repo, another_sha);
-
-	cl_git_pass(git_diff_tree_to_tree(g_repo, NULL, one, another, &diff));
-
-	cl_git_pass(git_diff_print_patch(diff, NULL, check_removal_cb));
-
-	git_diff_list_free(diff);
-
-	git_tree_free(another);
-	git_tree_free(one);
-}

data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/tree.c

@@ -1,210 +0,0 @@
-#include "clar_libgit2.h"
-#include "diff_helpers.h"
-
-static git_repository *g_repo = NULL;
-
-void test_diff_tree__initialize(void)
-{
-}
-
-void test_diff_tree__cleanup(void)
-{
-	cl_git_sandbox_cleanup();
-}
-
-void test_diff_tree__0(void)
-{
-	/* grabbed a couple of commit oids from the history of the attr repo */
-	const char *a_commit = "605812a";
-	const char *b_commit = "370fe9ec22";
-	const char *c_commit = "f5b0af1fb4f5c";
-	git_tree *a, *b, *c;
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-
-	g_repo = cl_git_sandbox_init("attr");
-
-	cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL);
-	cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL);
-	cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL);
-
-	opts.context_lines = 1;
-	opts.interhunk_lines = 1;
-
-	memset(&exp, 0, sizeof(exp));
-
-	cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, a, b, &diff));
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert(exp.files == 5);
-	cl_assert(exp.file_adds == 2);
-	cl_assert(exp.file_dels == 1);
-	cl_assert(exp.file_mods == 2);
-
-	cl_assert(exp.hunks == 5);
-
-	cl_assert(exp.lines == 7 + 24 + 1 + 6 + 6);
-	cl_assert(exp.line_ctxt == 1);
-	cl_assert(exp.line_adds == 24 + 1 + 5 + 5);
-	cl_assert(exp.line_dels == 7 + 1);
-
-	git_diff_list_free(diff);
-	diff = NULL;
-
-	memset(&exp, 0, sizeof(exp));
-
-	cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, c, b, &diff));
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert(exp.files == 2);
-	cl_assert(exp.file_adds == 0);
-	cl_assert(exp.file_dels == 0);
-	cl_assert(exp.file_mods == 2);
-
-	cl_assert(exp.hunks == 2);
-
-	cl_assert(exp.lines == 8 + 15);
-	cl_assert(exp.line_ctxt == 1);
-	cl_assert(exp.line_adds == 1);
-	cl_assert(exp.line_dels == 7 + 14);
-
-	git_diff_list_free(diff);
-
-	git_tree_free(a);
-	git_tree_free(b);
-	git_tree_free(c);
-}
-
-void test_diff_tree__options(void)
-{
-	/* grabbed a couple of commit oids from the history of the attr repo */
-	const char *a_commit = "6bab5c79cd5140d0";
-	const char *b_commit = "605812ab7fe421fdd";
-	const char *c_commit = "f5b0af1fb4f5";
-	const char *d_commit = "a97cc019851";
-	git_tree *a, *b, *c, *d;
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects actual;
-	int test_ab_or_cd[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1 };
-	git_diff_options test_options[] = {
-		/* a vs b tests */
-		{ GIT_DIFF_NORMAL, 1, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_REVERSE, 2, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_FORCE_TEXT, 2, 1, NULL, NULL, {0} },
-		/* c vs d tests */
-		{ GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_IGNORE_WHITESPACE, 3, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_IGNORE_WHITESPACE_CHANGE, 3, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_IGNORE_WHITESPACE_EOL, 3, 1, NULL, NULL, {0} },
-		{ GIT_DIFF_IGNORE_WHITESPACE | GIT_DIFF_REVERSE, 1, 1, NULL, NULL, {0} },
-	};
-	/* to generate these values:
-	 * - cd to tests/resources/attr,
-	 * - mv .gitted .git
-	 * - git diff [options] 6bab5c79cd5140d0 605812ab7fe421fdd
-	 * - mv .git .gitted
-	 */
-	diff_expects test_expects[] = {
-		/* a vs b tests */
-		{ 5, 3, 0, 2, 0, 0, 0, 4, 0, 0, 51, 2, 46, 3 },
-		{ 5, 3, 0, 2, 0, 0, 0, 4, 0, 0, 53, 4, 46, 3 },
-		{ 5, 0, 3, 2, 0, 0, 0, 4, 0, 0, 52, 3, 3, 46 },
-		{ 5, 3, 0, 2, 0, 0, 0, 5, 0, 0, 54, 3, 47, 4 },
-		/* c vs d tests */
-		{ 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 22, 9, 10, 3 },
-		{ 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 19, 12, 7, 0 },
-		{ 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 20, 11, 8, 1 },
-		{ 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 20, 11, 8, 1 },
-		{ 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 18, 11, 0, 7 },
-		{ 0 },
-	};
-	diff_expects *expected;
-	int i;
-
-	g_repo = cl_git_sandbox_init("attr");
-
-	cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL);
-	cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL);
-	cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL);
-	cl_assert((d = resolve_commit_oid_to_tree(g_repo, d_commit)) != NULL);
-
-	for (i = 0; test_expects[i].files > 0; i++) {
-		memset(&actual, 0, sizeof(actual)); /* clear accumulator */
-		opts = test_options[i];
-
-		if (test_ab_or_cd[i] == 0)
-			cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, a, b, &diff));
-		else
-			cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, c, d, &diff));
-
-		cl_git_pass(git_diff_foreach(
-			diff, &actual, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-		expected = &test_expects[i];
-		cl_assert_equal_i(actual.files,     expected->files);
-		cl_assert_equal_i(actual.file_adds, expected->file_adds);
- 		cl_assert_equal_i(actual.file_dels, expected->file_dels);
-		cl_assert_equal_i(actual.file_mods, expected->file_mods);
-		cl_assert_equal_i(actual.hunks,     expected->hunks);
-		cl_assert_equal_i(actual.lines,     expected->lines);
-		cl_assert_equal_i(actual.line_ctxt, expected->line_ctxt);
-		cl_assert_equal_i(actual.line_adds, expected->line_adds);
-		cl_assert_equal_i(actual.line_dels, expected->line_dels);
-
-		git_diff_list_free(diff);
-		diff = NULL;
-	}
-
-	git_tree_free(a);
-	git_tree_free(b);
-	git_tree_free(c);
-	git_tree_free(d);
-}
-
-void test_diff_tree__bare(void)
-{
-	const char *a_commit = "8496071c1b46c85";
-	const char *b_commit = "be3563ae3f79";
-	git_tree *a, *b;
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-
-	g_repo = cl_git_sandbox_init("testrepo.git");
-
-	cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL);
-	cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL);
-
-	opts.context_lines = 1;
-	opts.interhunk_lines = 1;
-
-	memset(&exp, 0, sizeof(exp));
-
-	cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, a, b, &diff));
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert(exp.files == 3);
-	cl_assert(exp.file_adds == 2);
-	cl_assert(exp.file_dels == 0);
-	cl_assert(exp.file_mods == 1);
-
-	cl_assert(exp.hunks == 3);
-
-	cl_assert(exp.lines == 4);
-	cl_assert(exp.line_ctxt == 0);
-	cl_assert(exp.line_adds == 3);
-	cl_assert(exp.line_dels == 1);
-
-	git_diff_list_free(diff);
-	git_tree_free(a);
-	git_tree_free(b);
-}

data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/workdir.c

@@ -1,543 +0,0 @@
-#include "clar_libgit2.h"
-#include "diff_helpers.h"
-
-static git_repository *g_repo = NULL;
-
-void test_diff_workdir__initialize(void)
-{
-}
-
-void test_diff_workdir__cleanup(void)
-{
-	cl_git_sandbox_cleanup();
-}
-
-void test_diff_workdir__to_index(void)
-{
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-
-	g_repo = cl_git_sandbox_init("status");
-
-	opts.context_lines = 3;
-	opts.interhunk_lines = 1;
-	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
-
-	memset(&exp, 0, sizeof(exp));
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	/* to generate these values:
-	 * - cd to tests/resources/status,
-	 * - mv .gitted .git
-	 * - git diff --name-status
-	 * - git diff
-	 * - mv .git .gitted
-	 */
-	cl_assert_equal_i(13, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(4, exp.file_dels);
-	cl_assert_equal_i(4, exp.file_mods);
-	cl_assert_equal_i(1, exp.file_ignored);
-	cl_assert_equal_i(4, exp.file_untracked);
-
-	cl_assert_equal_i(8, exp.hunks);
-
-	cl_assert_equal_i(14, exp.lines);
-	cl_assert_equal_i(5, exp.line_ctxt);
-	cl_assert_equal_i(4, exp.line_adds);
-	cl_assert_equal_i(5, exp.line_dels);
-
-	git_diff_list_free(diff);
-}
-
-void test_diff_workdir__to_tree(void)
-{
-	/* grabbed a couple of commit oids from the history of the attr repo */
-	const char *a_commit = "26a125ee1bf"; /* the current HEAD */
-	const char *b_commit = "0017bd4ab1ec3"; /* the start */
-	git_tree *a, *b;
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	git_diff_list *diff2 = NULL;
-	diff_expects exp;
-
-	g_repo = cl_git_sandbox_init("status");
-
-	a = resolve_commit_oid_to_tree(g_repo, a_commit);
-	b = resolve_commit_oid_to_tree(g_repo, b_commit);
-
-	opts.context_lines = 3;
-	opts.interhunk_lines = 1;
-	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
-
-	memset(&exp, 0, sizeof(exp));
-
-	/* You can't really generate the equivalent of git_diff_workdir_to_tree()
-	 * using C git.  It really wants to interpose the index into the diff.
-	 *
-	 * To validate the following results with command line git, I ran the
-	 * following:
-	 * - git ls-tree 26a125
-	 * - find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths
-	 * The results are documented at the bottom of this file in the
-	 * long comment entitled "PREPARATION OF TEST DATA".
-	 */
-	cl_git_pass(git_diff_workdir_to_tree(g_repo, &opts, a, &diff));
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(14, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(4, exp.file_dels);
-	cl_assert_equal_i(4, exp.file_mods);
-	cl_assert_equal_i(1, exp.file_ignored);
-	cl_assert_equal_i(5, exp.file_untracked);
-
-	/* Since there is no git diff equivalent, let's just assume that the
-	 * text diffs produced by git_diff_foreach are accurate here.  We will
-	 * do more apples-to-apples test comparison below.
-	 */
-
-	git_diff_list_free(diff);
-	diff = NULL;
-	memset(&exp, 0, sizeof(exp));
-
-	/* This is a compatible emulation of "git diff <sha>" which looks like
-	 * a workdir to tree diff (even though it is not really).  This is what
-	 * you would get from "git diff --name-status 26a125ee1bf"
-	 */
-	cl_git_pass(git_diff_index_to_tree(g_repo, &opts, a, &diff));
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff2));
-	cl_git_pass(git_diff_merge(diff, diff2));
-	git_diff_list_free(diff2);
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(15, exp.files);
-	cl_assert_equal_i(2, exp.file_adds);
-	cl_assert_equal_i(5, exp.file_dels);
-	cl_assert_equal_i(4, exp.file_mods);
-	cl_assert_equal_i(1, exp.file_ignored);
-	cl_assert_equal_i(3, exp.file_untracked);
-
-	cl_assert_equal_i(11, exp.hunks);
-
-	cl_assert_equal_i(17, exp.lines);
-	cl_assert_equal_i(4, exp.line_ctxt);
-	cl_assert_equal_i(8, exp.line_adds);
-	cl_assert_equal_i(5, exp.line_dels);
-
-	git_diff_list_free(diff);
-	diff = NULL;
-	memset(&exp, 0, sizeof(exp));
-
-	/* Again, emulating "git diff <sha>" for testing purposes using
-	 * "git diff --name-status 0017bd4ab1ec3" instead.
-	 */
-	cl_git_pass(git_diff_index_to_tree(g_repo, &opts, b, &diff));
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff2));
-	cl_git_pass(git_diff_merge(diff, diff2));
-	git_diff_list_free(diff2);
-
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(16, exp.files);
-	cl_assert_equal_i(5, exp.file_adds);
-	cl_assert_equal_i(4, exp.file_dels);
-	cl_assert_equal_i(3, exp.file_mods);
-	cl_assert_equal_i(1, exp.file_ignored);
-	cl_assert_equal_i(3, exp.file_untracked);
-
-	cl_assert_equal_i(12, exp.hunks);
-
-	cl_assert_equal_i(19, exp.lines);
-	cl_assert_equal_i(3, exp.line_ctxt);
-	cl_assert_equal_i(12, exp.line_adds);
-	cl_assert_equal_i(4, exp.line_dels);
-
-	git_diff_list_free(diff);
-
-	git_tree_free(a);
-	git_tree_free(b);
-}
-
-void test_diff_workdir__to_index_with_pathspec(void)
-{
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-	char *pathspec = NULL;
-
-	g_repo = cl_git_sandbox_init("status");
-
-	opts.context_lines = 3;
-	opts.interhunk_lines = 1;
-	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
-	opts.pathspec.strings = &pathspec;
-	opts.pathspec.count   = 1;
-
-	memset(&exp, 0, sizeof(exp));
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-	cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL));
-
-	cl_assert_equal_i(13, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(4, exp.file_dels);
-	cl_assert_equal_i(4, exp.file_mods);
-	cl_assert_equal_i(1, exp.file_ignored);
-	cl_assert_equal_i(4, exp.file_untracked);
-
-	git_diff_list_free(diff);
-
-	memset(&exp, 0, sizeof(exp));
-	pathspec = "modified_file";
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-	cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL));
-
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(0, exp.file_ignored);
-	cl_assert_equal_i(0, exp.file_untracked);
-
-	git_diff_list_free(diff);
-
-	memset(&exp, 0, sizeof(exp));
-	pathspec = "subdir";
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-	cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL));
-
-	cl_assert_equal_i(3, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(1, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(0, exp.file_ignored);
-	cl_assert_equal_i(1, exp.file_untracked);
-
-	git_diff_list_free(diff);
-
-	memset(&exp, 0, sizeof(exp));
-	pathspec = "*_deleted";
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-	cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL));
-
-	cl_assert_equal_i(2, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(2, exp.file_dels);
-	cl_assert_equal_i(0, exp.file_mods);
-	cl_assert_equal_i(0, exp.file_ignored);
-	cl_assert_equal_i(0, exp.file_untracked);
-
-	git_diff_list_free(diff);
-}
-
-void test_diff_workdir__filemode_changes(void)
-{
-	git_config *cfg;
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-
-	if (!cl_is_chmod_supported())
-		return;
-
-	g_repo = cl_git_sandbox_init("issue_592");
-
-	cl_git_pass(git_repository_config(&cfg, g_repo));
-	cl_git_pass(git_config_set_bool(cfg, "core.filemode", true));
-
-	/* test once with no mods */
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, NULL, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(0, exp.files);
-	cl_assert_equal_i(0, exp.file_mods);
-	cl_assert_equal_i(0, exp.hunks);
-
-	git_diff_list_free(diff);
-
-	/* chmod file and test again */
-
-	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, NULL, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(0, exp.hunks);
-
-	git_diff_list_free(diff);
-
-	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
-	git_config_free(cfg);
-}
-
-void test_diff_workdir__filemode_changes_with_filemode_false(void)
-{
-	git_config *cfg;
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-
-	if (!cl_is_chmod_supported())
-		return;
-
-	g_repo = cl_git_sandbox_init("issue_592");
-
-	cl_git_pass(git_repository_config(&cfg, g_repo));
-	cl_git_pass(git_config_set_bool(cfg, "core.filemode", false));
-
-	/* test once with no mods */
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, NULL, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(0, exp.files);
-	cl_assert_equal_i(0, exp.file_mods);
-	cl_assert_equal_i(0, exp.hunks);
-
-	git_diff_list_free(diff);
-
-	/* chmod file and test again */
-
-	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, NULL, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-
-	cl_assert_equal_i(0, exp.files);
-	cl_assert_equal_i(0, exp.file_mods);
-	cl_assert_equal_i(0, exp.hunks);
-
-	git_diff_list_free(diff);
-
-	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
-	git_config_free(cfg);
-}
-
-void test_diff_workdir__head_index_and_workdir_all_differ(void)
-{
-	git_diff_options opts = {0};
-	git_diff_list *diff_i2t = NULL, *diff_w2i = NULL;
-	diff_expects exp;
-	char *pathspec = "staged_changes_modified_file";
-	git_tree *tree;
-
-	/* For this file,
-	 * - head->index diff has 1 line of context, 1 line of diff
-	 * - index->workdir diff has 2 lines of context, 1 line of diff
-	 * but
-	 * - head->workdir diff has 1 line of context, 2 lines of diff
-	 * Let's make sure the right one is returned from each fn.
-	 */
-
-	g_repo = cl_git_sandbox_init("status");
-
-	tree = resolve_commit_oid_to_tree(g_repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f");
-
-	opts.pathspec.strings = &pathspec;
-	opts.pathspec.count   = 1;
-
-	cl_git_pass(git_diff_index_to_tree(g_repo, &opts, tree, &diff_i2t));
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff_w2i));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(1, exp.hunks);
-	cl_assert_equal_i(2, exp.lines);
-	cl_assert_equal_i(1, exp.line_ctxt);
-	cl_assert_equal_i(1, exp.line_adds);
-	cl_assert_equal_i(0, exp.line_dels);
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff_w2i, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(1, exp.hunks);
-	cl_assert_equal_i(3, exp.lines);
-	cl_assert_equal_i(2, exp.line_ctxt);
-	cl_assert_equal_i(1, exp.line_adds);
-	cl_assert_equal_i(0, exp.line_dels);
-
-	cl_git_pass(git_diff_merge(diff_i2t, diff_w2i));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(1, exp.hunks);
-	cl_assert_equal_i(3, exp.lines);
-	cl_assert_equal_i(1, exp.line_ctxt);
-	cl_assert_equal_i(2, exp.line_adds);
-	cl_assert_equal_i(0, exp.line_dels);
-
-	git_diff_list_free(diff_i2t);
-	git_diff_list_free(diff_w2i);
-}
-
-void test_diff_workdir__eof_newline_changes(void)
-{
-	git_diff_options opts = {0};
-	git_diff_list *diff = NULL;
-	diff_expects exp;
-	char *pathspec = "current_file";
-
-	g_repo = cl_git_sandbox_init("status");
-
-	opts.pathspec.strings = &pathspec;
-	opts.pathspec.count   = 1;
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(0, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(0, exp.file_mods);
-	cl_assert_equal_i(0, exp.hunks);
-	cl_assert_equal_i(0, exp.lines);
-	cl_assert_equal_i(0, exp.line_ctxt);
-	cl_assert_equal_i(0, exp.line_adds);
-	cl_assert_equal_i(0, exp.line_dels);
-
-	git_diff_list_free(diff);
-
-	cl_git_append2file("status/current_file", "\n");
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(1, exp.hunks);
-	cl_assert_equal_i(2, exp.lines);
-	cl_assert_equal_i(1, exp.line_ctxt);
-	cl_assert_equal_i(1, exp.line_adds);
-	cl_assert_equal_i(0, exp.line_dels);
-
-	git_diff_list_free(diff);
-
-	cl_git_rewritefile("status/current_file", "current_file");
-
-	cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff));
-
-	memset(&exp, 0, sizeof(exp));
-	cl_git_pass(git_diff_foreach(
-		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
-	cl_assert_equal_i(1, exp.files);
-	cl_assert_equal_i(0, exp.file_adds);
-	cl_assert_equal_i(0, exp.file_dels);
-	cl_assert_equal_i(1, exp.file_mods);
-	cl_assert_equal_i(1, exp.hunks);
-	cl_assert_equal_i(3, exp.lines);
-	cl_assert_equal_i(0, exp.line_ctxt);
-	cl_assert_equal_i(1, exp.line_adds);
-	cl_assert_equal_i(2, exp.line_dels);
-
-	git_diff_list_free(diff);
-}
-
-/* PREPARATION OF TEST DATA
- *
- * Since there is no command line equivalent of git_diff_workdir_to_tree,
- * it was a bit of a pain to confirm that I was getting the expected
- * results in the first part of this tests.  Here is what I ended up
- * doing to set my expectation for the file counts and results:
- *
- * Running "git ls-tree 26a125" and "git ls-tree aa27a6" shows:
- *
- *  A a0de7e0ac200c489c41c59dfa910154a70264e6e	current_file
- *  B 5452d32f1dd538eb0405e8a83cc185f79e25e80f	file_deleted
- *  C 452e4244b5d083ddf0460acf1ecc74db9dcfa11a	modified_file
- *  D 32504b727382542f9f089e24fddac5e78533e96c	staged_changes
- *  E 061d42a44cacde5726057b67558821d95db96f19	staged_changes_file_deleted
- *  F 70bd9443ada07063e7fbf0b3ff5c13f7494d89c2	staged_changes_modified_file
- *  G e9b9107f290627c04d097733a10055af941f6bca	staged_delete_file_deleted
- *  H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916	staged_delete_modified_file
- *  I 53ace0d1cc1145a5f4fe4f78a186a60263190733	subdir/current_file
- *  J 1888c805345ba265b0ee9449b8877b6064592058	subdir/deleted_file
- *  K a6191982709b746d5650e93c2acf34ef74e11504	subdir/modified_file
- *  L e8ee89e15bbe9b20137715232387b3de5b28972e	subdir.txt
- *
- * --------
- *
- * find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths
- *
- *  A a0de7e0ac200c489c41c59dfa910154a70264e6e current_file
- *  M 6a79f808a9c6bc9531ac726c184bbcd9351ccf11 ignored_file
- *  C 0a539630525aca2e7bc84975958f92f10a64c9b6 modified_file
- *  N d4fa8600b4f37d7516bef4816ae2c64dbf029e3a new_file
- *  D 55d316c9ba708999f1918e9677d01dfcae69c6b9 staged_changes
- *  F 011c3440d5c596e21d836aa6d7b10eb581f68c49 staged_changes_modified_file
- *  H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 staged_delete_modified_file
- *  O 529a16e8e762d4acb7b9636ff540a00831f9155a staged_new_file
- *  P 8b090c06d14ffa09c4e880088ebad33893f921d1 staged_new_file_modified_file
- *  I 53ace0d1cc1145a5f4fe4f78a186a60263190733 subdir/current_file
- *  K 57274b75eeb5f36fd55527806d567b2240a20c57 subdir/modified_file
- *  Q 80a86a6931b91bc01c2dbf5ca55bdd24ad1ef466 subdir/new_file
- *  L e8ee89e15bbe9b20137715232387b3de5b28972e subdir.txt
- *
- * --------
- *
- *  A - current_file (UNMODIFIED) -> not in results
- *  B D file_deleted
- *  M I ignored_file (IGNORED)
- *  C M modified_file
- *  N U new_file (UNTRACKED)
- *  D M staged_changes
- *  E D staged_changes_file_deleted
- *  F M staged_changes_modified_file
- *  G D staged_delete_file_deleted
- *  H - staged_delete_modified_file (UNMODIFIED) -> not in results
- *  O U staged_new_file
- *  P U staged_new_file_modified_file
- *  I - subdir/current_file (UNMODIFIED) -> not in results
- *  J D subdir/deleted_file
- *  K M subdir/modified_file
- *  Q U subdir/new_file
- *  L - subdir.txt (UNMODIFIED) -> not in results
- *
- * Expect 13 files, 0 ADD, 4 DEL, 4 MOD, 1 IGN, 4 UNTR
- */