Commit 3208df37fbddeb3ec467fd5b3b98be77b29ad196

Edward Thomson 2015-06-02T18:28:06

patch: include diff options on blob->blob diffs

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/src/diff_patch.c b/src/diff_patch.c
index 81b93e9..63253c2 100644
--- a/src/diff_patch.c
+++ b/src/diff_patch.c
@@ -469,7 +469,8 @@ static int diff_patch_from_sources(
 	git_diff_file *lfile = &pd->delta.old_file, *rfile = &pd->delta.new_file;
 	git_diff_file_content *ldata = &pd->patch.ofile, *rdata = &pd->patch.nfile;
 
-	GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
+	if ((error = diff_patch_normalize_options(&pd->patch.diff_opts, opts)) < 0)
+		return error;
 
 	if (opts && (opts->flags & GIT_DIFF_REVERSE) != 0) {
 		void *tmp = lfile; lfile = rfile; rfile = tmp;