diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-21 19:40:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 22:49:19 -0700 |
| commit | 38c6f78059c3060db6f94b24f4a90063a91090d2 (patch) | |
| tree | 18d06f832da6e27f4b600b64b3dc27c393c71ea1 /diff-cache.c | |
| parent | 58b103f55d5b95dc24cce2fb4f64e697958fd204 (diff) | |
| download | git-38c6f78059c3060db6f94b24f4a90063a91090d2.tar.gz | |
[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-cache.c')
| -rw-r--r-- | diff-cache.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/diff-cache.c b/diff-cache.c index c604359401..fe6f455344 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -214,9 +214,7 @@ int main(int argc, char **argv) if (argc != 2 || get_sha1(argv[1], tree_sha1)) usage(diff_cache_usage); - 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)); mark_merge_entries(); @@ -227,6 +225,10 @@ int main(int argc, char **argv) die("unable to read tree object %s", argv[1]); ret = diff_cache(active_cache, active_nr); - diff_flush(); + if (detect_rename) + diff_detect_rename(detect_rename, diff_score_opt); + if (pickaxe) + diff_pickaxe(pickaxe); + diff_flush(NULL, 0); return ret; } |