patch: include diff options on blob->blob diffs

3208df37 · Edward Thomson · Edward Thomson · 391281ae · 3208df37
Commit 3208df37 authored Jun 02, 2015 by Edward Thomson Committed by Edward Thomson Jun 12, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/diff_patch.c
+2 -1

No files found.
--- 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;