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.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 357c4efce1..68e7db8667 100644 --- a/diff.c +++ b/diff.c @@ -887,6 +887,18 @@ void diff_flush(int diff_output_style, int resolve_rename_copy) q->nr = q->alloc = 0; } +void diffcore_std(const char **paths, + int detect_rename, int rename_score, + const char *pickaxe, int pickaxe_opts) +{ + if (paths && paths[0]) + diffcore_pathspec(paths); + if (detect_rename) + diffcore_rename(detect_rename, rename_score); + if (pickaxe) + diffcore_pickaxe(pickaxe, pickaxe_opts); +} + void diff_addremove(int addremove, unsigned mode, const unsigned char *sha1, const char *base, const char *path) -- cgit v1.3