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

10
diff-cache.c
View File

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