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

[PATCH] diff: consolidate various calls into diffcore.

Browse Source 
The three diff-* brothers had a sequence of calls into diffcore
that were almost identical.  Introduce a new diffcore_std()
function that takes all the necessary arguments to consolidate
it.  This will make later enhancements and changing the order of
diffcore application simpler.

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-29 16:56:13 -07:00
committed by Linus Torvalds
parent ddafa7e933
commit befe86392c
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff-tree.c
View File

@ -261,10 +261,9 @@ static void call_diff_setup(void)
static int call_diff_flush(void)
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts);
diffcore_std(0,
detect_rename, diff_score_opt,
pickaxe, pickaxe_opts);
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
return 0;