path: root/diff-cache.c
diff options
authorJunio C Hamano <>2005-05-29 23:56:13 (GMT)
committerLinus Torvalds <>2005-05-30 17:35:49 (GMT)
commitbefe86392c767b62e4a6498cf951faae6f2c5ea3 (patch)
tree773e4f15fd5652983309b27c5f22dd29899cb749 /diff-cache.c
parentddafa7e93325d45cd4bd950dd8e89ff3188d0250 (diff)
[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 <>
Diffstat (limited to 'diff-cache.c')
1 files changed, 3 insertions, 6 deletions
diff --git a/diff-cache.c b/diff-cache.c
index 1e0fda5..c097826 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;