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-files.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'diff-files.c') diff --git a/diff-files.c b/diff-files.c index 8ab7915977..3f20e7eee3 100644 --- a/diff-files.c +++ b/diff-files.c @@ -116,12 +116,9 @@ int main(int argc, const char **argv) show_modified(oldmode, mode, ce->sha1, null_sha1, ce->name); } - if (1 < argc) - diffcore_pathspec(argv + 1); - if (detect_rename) - diffcore_rename(detect_rename, diff_score_opt); - if (pickaxe) - diffcore_pickaxe(pickaxe, pickaxe_opts); + diffcore_std(argv + 1, + detect_rename, diff_score_opt, + pickaxe, pickaxe_opts); diff_flush(diff_output_format, 1); return 0; } -- cgit v1.2.1