diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-22 02:40:36 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 05:49:19 (GMT) |
| commit | 38c6f78059c3060db6f94b24f4a90063a91090d2 (patch) | |
| tree | 18d06f832da6e27f4b600b64b3dc27c393c71ea1 /diff-helper.c | |
| parent | 58b103f55d5b95dc24cce2fb4f64e697958fd204 (diff) | |
| download | git-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-helper.c')
| -rw-r--r-- | diff-helper.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/diff-helper.c b/diff-helper.c index 3c39c96..108ca07 100644 --- a/diff-helper.c +++ b/diff-helper.c @@ -127,10 +127,7 @@ int main(int ac, const char **av) { } /* the remaining parameters are paths patterns */ - diff_setup(detect_rename, diff_score_opt, pickaxe, - reverse, (generate_patch ? -1 : line_termination), - av+1, ac-1); - + diff_setup(reverse, (generate_patch ? -1 : line_termination)); while (1) { int status; read_line(&sb, stdin, line_termination); @@ -138,11 +135,15 @@ int main(int ac, const char **av) { break; status = parse_diff_raw_output(sb.buf); if (status) { - diff_flush(); + diff_flush(av+1, ac-1); printf("%s%c", sb.buf, line_termination); } } - diff_flush(); + if (detect_rename) + diff_detect_rename(detect_rename, diff_score_opt); + if (pickaxe) + diff_pickaxe(pickaxe); + diff_flush(av+1, ac-1); return 0; } |