aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-21 19:40:36 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 22:49:19 -0700
commit38c6f78059c3060db6f94b24f4a90063a91090d2 (patch)
tree18d06f832da6e27f4b600b64b3dc27c393c71ea1 /diff.h
parent58b103f55d5b95dc24cce2fb4f64e697958fd204 (diff)
downloadgit-38c6f78059c3060db6f94b24f4a90063a91090d2.tar.gz
git-38c6f78059c3060db6f94b24f4a90063a91090d2.tar.xz
[PATCH] Prepare diffcore interface for diff-tree header supression.
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>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/diff.h b/diff.h
index 7473c5228..7b9f37d1b 100644
--- a/diff.h
+++ b/diff.h
@@ -19,11 +19,13 @@ extern void diff_unmerge(const char *path);
extern int diff_scoreopt_parse(const char *opt);
-extern void diff_setup(int detect_rename, int minimum_score,
- const char *pickaxe,
- int reverse, int raw_output,
- const char **spec, int cnt);
+extern void diff_setup(int reverse, int diff_raw_output);
-extern void diff_flush(void);
+extern void diff_detect_rename(int, int);
+extern void diff_pickaxe(const char *);
+
+extern int diff_queue_is_empty(void);
+
+extern void diff_flush(const char **, int);
#endif /* DIFF_H */