proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 17:41:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2828 from ethomson/treediff_dont_patch

Browse Source 
diff: only compute patches when requested
This commit is contained in:
Carlos Martín Nieto 2015-01-20 20:13:34 +01:00
commit 2136240dbd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/diff_patch.c
View File

@ -284,11 +284,12 @@ int git_diff_foreach(
if (git_diff_delta__should_skip(&diff->opts, patch.delta)) if (git_diff_delta__should_skip(&diff->opts, patch.delta))
continue; continue;
if ((error = diff_patch_init_from_diff(&patch, diff, idx)) < 0) if ((error = diff_patch_invoke_file_callback(&patch, &xo.output)) == 0) {
break; if (hunk_cb || data_cb) {
if ((error = diff_patch_init_from_diff(&patch, diff, idx)) == 0)
if (!(error = diff_patch_invoke_file_callback(&patch, &xo.output)))
error = diff_patch_generate(&patch, &xo.output); error = diff_patch_generate(&patch, &xo.output);
}
}
git_patch_free(&patch); git_patch_free(&patch);