[PATCH] diff: consolidate various calls into diffcore.

[git.git] / diff-cache.c

diff --git a/diff-cache.c b/diff-cache.c
index 1e0fda5..c097826 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -240,12 +240,9 @@ int main(int argc, const char **argv)
                die("unable to read tree object %s", tree_name);
 
        ret = diff_cache(active_cache, active_nr);
-       if (pathspec)
-               diffcore_pathspec(pathspec);
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe, pickaxe_opts);
+       diffcore_std(pathspec,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts);
        diff_flush(diff_output_format, 1);
        return ret;
 }