From 38c6f78059c3060db6f94b24f4a90063a91090d2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 21 May 2005 19:40:36 -0700 Subject: [PATCH] Prepare diffcore interface for diff-tree header supression. This does not actually supress the extra headers when pickaxe is used, but prepares enough support for diff-tree to implement it. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff-files.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'diff-files.c') diff --git a/diff-files.c b/diff-files.c index 6dca9e0e2b..a47bd4376c 100644 --- a/diff-files.c +++ b/diff-files.c @@ -92,9 +92,7 @@ int main(int argc, char **argv) exit(1); } - diff_setup(detect_rename, diff_score_opt, pickaxe, - reverse_diff, (generate_patch ? -1 : line_termination), - NULL, 0); + diff_setup(reverse_diff, (generate_patch ? -1 : line_termination)); for (i = 0; i < entries; i++) { struct stat st; @@ -136,6 +134,10 @@ int main(int argc, char **argv) show_modified(oldmode, mode, ce->sha1, null_sha1, ce->name); } - diff_flush(); + if (detect_rename) + diff_detect_rename(detect_rename, diff_score_opt); + if (pickaxe) + diff_pickaxe(pickaxe); + diff_flush(NULL, 0); return 0; } -- cgit v1.2.1