[PATCH] diff: consolidate various calls into diffcore.

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 8bdb1db..d634cb1 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -261,10 +261,9 @@ static void call_diff_setup(void)
 
 static int call_diff_flush(void)
 {
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe, pickaxe_opts);
+       diffcore_std(0,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts);
        if (diff_queue_is_empty()) {
                diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
                return 0;