patch: include diff options on blob->blob diffs

This commit is contained in:
Edward Thomson 2015-06-02 18:28:06 -04:00 committed by Edward Thomson
parent 391281ae34
commit 3208df37fb

View File

@ -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 *lfile = &pd->delta.old_file, *rfile = &pd->delta.new_file;
git_diff_file_content *ldata = &pd->patch.ofile, *rdata = &pd->patch.nfile; 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) { if (opts && (opts->flags & GIT_DIFF_REVERSE) != 0) {
void *tmp = lfile; lfile = rfile; rfile = tmp; void *tmp = lfile; lfile = rfile; rfile = tmp;