diff --git a/src/diff.c b/src/diff.c
index 9a12aa07c..197fe354a 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -486,9 +486,11 @@ static int set_file_is_binary(
 	return GIT_SUCCESS;
 }
 
-static void setup_xdiff_config(git_diff_options *opts, xdemitconf_t *cfg)
+static void setup_xdiff_options(
+	git_diff_options *opts, xdemitconf_t *cfg, xpparam_t *param)
 {
 	memset(cfg, 0, sizeof(xdemitconf_t));
+	memset(param, 0, sizeof(xpparam_t));
 
 	cfg->ctxlen =
 		(!opts || !opts->context_lines) ? 3 : opts->context_lines;
@@ -499,11 +501,11 @@ static void setup_xdiff_config(git_diff_options *opts, xdemitconf_t *cfg)
 		return;
 
 	if (opts->flags & GIT_DIFF_IGNORE_WHITESPACE)
-		cfg->flags |= XDF_WHITESPACE_FLAGS;
+		param->flags |= XDF_WHITESPACE_FLAGS;
 	if (opts->flags & GIT_DIFF_IGNORE_WHITESPACE_CHANGE)
-		cfg->flags |= XDF_IGNORE_WHITESPACE_CHANGE;
+		param->flags |= XDF_IGNORE_WHITESPACE_CHANGE;
 	if (opts->flags & GIT_DIFF_IGNORE_WHITESPACE_EOL)
-		cfg->flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
+		param->flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
 }
 
 int git_diff_foreach(
@@ -525,8 +527,7 @@ int git_diff_foreach(
 	di.hunk_cb = hunk_cb;
 	di.line_cb = line_cb;
 
-	memset(&xdiff_params, 0, sizeof(xdiff_params));
-	setup_xdiff_config(&diff->opts, &xdiff_config);
+	setup_xdiff_options(&diff->opts, &xdiff_config, &xdiff_params);
 	memset(&xdiff_callback, 0, sizeof(xdiff_callback));
 	xdiff_callback.outf = diff_output_cb;
 	xdiff_callback.priv = &di;
@@ -898,8 +899,7 @@ int git_diff_blobs(
 	di.hunk_cb = hunk_cb;
 	di.line_cb = line_cb;
 
-	memset(&xdiff_params, 0, sizeof(xdiff_params));
-	setup_xdiff_config(options, &xdiff_config);
+	setup_xdiff_options(options, &xdiff_config, &xdiff_params);
 	memset(&xdiff_callback, 0, sizeof(xdiff_callback));
 	xdiff_callback.outf = diff_output_cb;
 	xdiff_callback.priv = &di;
diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c
index b32c4bc2d..80c648033 100644
--- a/tests-clar/diff/diff_helpers.c
+++ b/tests-clar/diff/diff_helpers.c
@@ -72,9 +72,11 @@ int diff_line_fn(
 		e->line_ctxt++;
 		break;
 	case GIT_DIFF_LINE_ADDITION:
+	case GIT_DIFF_LINE_ADD_EOFNL:
 		e->line_adds++;
 		break;
 	case GIT_DIFF_LINE_DELETION:
+	case GIT_DIFF_LINE_DEL_EOFNL:
 		e->line_dels++;
 		break;
 	default:
diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c
index 836db5765..eb4092af8 100644
--- a/tests-clar/diff/tree.c
+++ b/tests-clar/diff/tree.c
@@ -84,3 +84,90 @@ void test_diff_tree__0(void)
 	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 = resolve_commit_oid_to_tree(g_repo, a_commit);
+	git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit);
+	git_tree *c = resolve_commit_oid_to_tree(g_repo, c_commit);
+	git_tree *d = resolve_commit_oid_to_tree(g_repo, d_commit);
+
+	git_diff_options opts = {0};
+	git_diff_list *diff = NULL;
+	diff_expects exp;
+	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, 4, 0, 0, 51, 2, 46, 3 },
+		{ 5, 3, 0, 2, 4, 0, 0, 53, 4, 46, 3 },
+		{ 5, 0, 3, 2, 4, 0, 0, 52, 3, 3, 46 },
+		{ 5, 3, 0, 2, 5, 0, 0, 54, 3, 48, 3 },
+		/* c vs d tests */
+		{ 1, 0, 0, 1, 1, 0, 0, 22, 9, 10, 3 },
+		{ 1, 0, 0, 1, 1, 0, 0, 19, 12, 7, 0 },
+		{ 1, 0, 0, 1, 1, 0, 0, 20, 11, 8, 1 },
+		{ 1, 0, 0, 1, 1, 0, 0, 20, 11, 8, 1 },
+		{ 1, 0, 0, 1, 1, 0, 0, 18, 11, 0, 7 },
+		{ 0 },
+	};
+	int i;
+
+	cl_assert(a);
+	cl_assert(b);
+
+	for (i = 0; test_expects[i].files > 0; i++) {
+		memset(&exp, 0, sizeof(exp)); /* 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, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
+
+		cl_assert(exp.files     == test_expects[i].files);
+		cl_assert(exp.file_adds == test_expects[i].file_adds);
+		cl_assert(exp.file_dels == test_expects[i].file_dels);
+		cl_assert(exp.file_mods == test_expects[i].file_mods);
+		cl_assert(exp.hunks     == test_expects[i].hunks);
+		cl_assert(exp.lines     == test_expects[i].lines);
+		cl_assert(exp.line_ctxt == test_expects[i].line_ctxt);
+		cl_assert(exp.line_adds == test_expects[i].line_adds);
+		cl_assert(exp.line_dels == test_expects[i].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);
+}
diff --git a/tests/resources/attr/.gitted/index b/tests/resources/attr/.gitted/index
index f35d3005e..19fa99d5b 100644
Binary files a/tests/resources/attr/.gitted/index and b/tests/resources/attr/.gitted/index differ
diff --git a/tests/resources/attr/.gitted/logs/HEAD b/tests/resources/attr/.gitted/logs/HEAD
index 6d096351c..68fcff2c5 100644
Binary files a/tests/resources/attr/.gitted/logs/HEAD and b/tests/resources/attr/.gitted/logs/HEAD differ
diff --git a/tests/resources/attr/.gitted/logs/refs/heads/master b/tests/resources/attr/.gitted/logs/refs/heads/master
index 6d096351c..68fcff2c5 100644
Binary files a/tests/resources/attr/.gitted/logs/refs/heads/master and b/tests/resources/attr/.gitted/logs/refs/heads/master differ
diff --git a/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e b/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e
new file mode 100644
index 000000000..edcf7520c
Binary files /dev/null and b/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e differ
diff --git a/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd b/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd
new file mode 100644
index 000000000..e832241c9
Binary files /dev/null and b/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd differ
diff --git a/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba b/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba
new file mode 100644
index 000000000..1a7ec0c55
Binary files /dev/null and b/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba differ
diff --git a/tests/resources/attr/.gitted/refs/heads/master b/tests/resources/attr/.gitted/refs/heads/master
index 9eca42413..7f8bbe3e7 100644
Binary files a/tests/resources/attr/.gitted/refs/heads/master and b/tests/resources/attr/.gitted/refs/heads/master differ
diff --git a/tests/resources/attr/root_test3 b/tests/resources/attr/root_test3
index c96bbb2c2..108bb4e7f 100644
Binary files a/tests/resources/attr/root_test3 and b/tests/resources/attr/root_test3 differ