[PATCH] Fix tweak in similarity estimator.

diff --git a/diff.h b/diff.h
index 86a645afee15ae061b7965b46ec2e97aa406bcec..1fc8469cfc2f1463274333c0bebab0e4e495bc6b 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -15,14 +15,27 @@ extern void diff_change(unsigned mode1, unsigned mode2,
                             const unsigned char *sha2,
                             const char *base, const char *path);
 
+extern void diff_guif(unsigned mode1,
+                     unsigned mode2,
+                     const unsigned char *sha1,
+                     const unsigned char *sha2,
+                     const char *path1,
+                     const char *path2);
+
 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,
-                      int reverse, int raw_output,
-                      const char **spec, int cnt);
+#define DIFF_FORMAT_HUMAN   0
+#define DIFF_FORMAT_MACHINE 1
+#define DIFF_FORMAT_PATCH   2
+extern void diff_setup(int reverse, int diff_output_style);
+
+extern void diff_detect_rename(int, int);
+extern void diff_pickaxe(const char *);
+
+extern int diff_queue_is_empty(void);
 
-extern void diff_flush(void);
+extern void diff_flush(const char **, int);
 
 #endif /* DIFF_H */