diff-tree: don't print multiple headers for merges when silent.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 0b76cc42816e1f7804df6f313f24ce9be491b6e8..7473c522846068b8e4ea3a4f4a62eba239b0e90e 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -17,21 +17,13 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 
 extern void diff_unmerge(const char *path);
 
-/* These are for diff-tree-helper */
+extern int diff_scoreopt_parse(const char *opt);
 
-struct diff_spec {
-       unsigned char blob_sha1[20];
-       unsigned short mode;     /* file mode */
-       unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
-                                 * however with a NULL SHA1, read them
-                                 * from the file system.
-                                 * if false, use the name and read mode from
-                                 * the filesystem.
-                                 */
-       unsigned file_valid : 1; /* if false the file does not even exist */
-};
+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 run_external_diff(const char *name,
-                             struct diff_spec *, struct diff_spec *);
+extern void diff_flush(void);
 
 #endif /* DIFF_H */