Commit 2136240d by Carlos Martín Nieto

Merge pull request #2828 from ethomson/treediff_dont_patch

diff: only compute patches when requested
parents d5712ed2 147d86fc
......@@ -284,11 +284,12 @@ int git_diff_foreach(
if (git_diff_delta__should_skip(&diff->opts, patch.delta))
continue;
if ((error = diff_patch_init_from_diff(&patch, diff, idx)) < 0)
break;
if (!(error = diff_patch_invoke_file_callback(&patch, &xo.output)))
error = diff_patch_generate(&patch, &xo.output);
if ((error = diff_patch_invoke_file_callback(&patch, &xo.output)) == 0) {
if (hunk_cb || data_cb) {
if ((error = diff_patch_init_from_diff(&patch, diff, idx)) == 0)
error = diff_patch_generate(&patch, &xo.output);
}
}
git_patch_free(&patch);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment