diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-02 18:28:06 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-06-12 09:39:33 -0400 |
| commit | 3208df37fbddeb3ec467fd5b3b98be77b29ad196 (patch) | |
| tree | 1dfa32af471586cfb3ba503b738fe27acd9cb205 | |
| parent | 391281ae34ba35abfdcc7589da3a9b9d67ae1c6f (diff) | |
| download | libgit2-3208df37fbddeb3ec467fd5b3b98be77b29ad196.tar.gz | |
patch: include diff options on blob->blob diffs
| -rw-r--r-- | src/diff_patch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff_patch.c b/src/diff_patch.c index 81b93e93e..63253c2c5 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; |