summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-22 02:40:36 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-22 05:49:19 (GMT)
commit38c6f78059c3060db6f94b24f4a90063a91090d2 (patch)
tree18d06f832da6e27f4b600b64b3dc27c393c71ea1 /diff-files.c
parent58b103f55d5b95dc24cce2fb4f64e697958fd204 (diff)
downloadgit-38c6f78059c3060db6f94b24f4a90063a91090d2.zip
git-38c6f78059c3060db6f94b24f4a90063a91090d2.tar.gz
git-38c6f78059c3060db6f94b24f4a90063a91090d2.tar.bz2
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/diff-files.c b/diff-files.c
index 6dca9e0..a47bd43 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;
}