diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-29 16:56:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-30 10:35:49 -0700 |
| commit | befe86392c767b62e4a6498cf951faae6f2c5ea3 (patch) | |
| tree | 773e4f15fd5652983309b27c5f22dd29899cb749 /diff-tree.c | |
| parent | ddafa7e93325d45cd4bd950dd8e89ff3188d0250 (diff) | |
| download | git-befe86392c767b62e4a6498cf951faae6f2c5ea3.tar.gz | |
[PATCH] diff: consolidate various calls into diffcore.
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>
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/diff-tree.c b/diff-tree.c index 8bdb1dba59..d634cb19e4 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -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; |