From befe86392c767b62e4a6498cf951faae6f2c5ea3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 May 2005 16:56:13 -0700 Subject: [PATCH] diff: consolidate various calls into diffcore. The three diff-* brothers had a sequence of calls into diffcore that were almost identical. Introduce a new diffcore_std() function that takes all the necessary arguments to consolidate it. This will make later enhancements and changing the order of diffcore application simpler. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff-cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'diff-cache.c') diff --git a/diff-cache.c b/diff-cache.c index 1e0fda5299..c097826719 100644 --- 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; } -- cgit v1.2.1