X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-tree.c;h=a7e7345bd622e1885471345c759d0fe9ae20c6d9;hb=25d5ea410fd528c13e5f56f7836ee8a3b839b168;hp=0d21b18ff700a37509dfb9bd57f2fa636840cb5c;hpb=b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298;p=git.git diff --git a/diff-tree.c b/diff-tree.c index 0d21b18f..a7e7345b 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -266,13 +266,11 @@ static int call_diff_flush(void) { if (detect_rename) diffcore_rename(detect_rename, diff_score_opt); - diffcore_prune(); - if (pickaxe) { + if (pickaxe) diffcore_pickaxe(pickaxe); - if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); - return 0; - } + if (diff_queue_is_empty()) { + diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); + return 0; } if (nr_paths) diffcore_pathspec(paths);