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-cache.c | |
| parent | ddafa7e93325d45cd4bd950dd8e89ff3188d0250 (diff) | |
| download | git-befe86392c767b62e4a6498cf951faae6f2c5ea3.tar.gz git-befe86392c767b62e4a6498cf951faae6f2c5ea3.tar.xz | |
[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-cache.c')
| -rw-r--r-- | diff-cache.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/diff-cache.c b/diff-cache.c index 1e0fda529..c09782671 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -240,12 +240,9 @@ int main(int argc, const char **argv) die("unable to read tree object %s", tree_name); ret = diff_cache(active_cache, active_nr); - if (pathspec) - diffcore_pathspec(pathspec); - if (detect_rename) - diffcore_rename(detect_rename, diff_score_opt); - if (pickaxe) - diffcore_pickaxe(pickaxe, pickaxe_opts); + diffcore_std(pathspec, + detect_rename, diff_score_opt, + pickaxe, pickaxe_opts); diff_flush(diff_output_format, 1); return ret; } |