summaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-30 01:56:13 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-30 19:35:49 +0200
commitbefe86392c767b62e4a6498cf951faae6f2c5ea3 (patch)
tree773e4f15fd5652983309b27c5f22dd29899cb749 /diff.h
parent[PATCH] diff-helper: Fix R/C score parsing under -z flag. (diff)
downloadgit-befe86392c767b62e4a6498cf951faae6f2c5ea3.tar.xz
git-befe86392c767b62e4a6498cf951faae6f2c5ea3.zip
[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.h')
-rw-r--r--diff.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index a07ee9f367..00e46b544d 100644
--- a/diff.h
+++ b/diff.h
@@ -43,6 +43,10 @@ extern void diffcore_pickaxe(const char *needle, int opts);
extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_std(const char **paths,
+ int detect_rename, int rename_score,
+ const char *pickaxe, int pickaxe_opts);
+
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_HUMAN 0