mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Prepare diffcore interface for diff-tree header supression.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-05-21 19:40:36 -07:00
committed by Linus Torvalds
parent 58b103f55d
commit 38c6f78059
9 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
diff-helper.c
View File

@ -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;
}