X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=7473c522846068b8e4ea3a4f4a62eba239b0e90e;hb=d6db01075b65da2b8584a0450619390893aae103;hp=24df9089cc024ec01f79102ceb429353f1707404;hpb=be3cfa85f45e32722a65349d023667be906a66b6;p=git.git

diff --git a/diff.h b/diff.h
index 24df9089..7473c522 100644
--- a/diff.h
+++ b/diff.h
@@ -4,28 +4,26 @@
 #ifndef DIFF_H
 #define DIFF_H
 
-/* These two are for backward compatibility with show-diff;
- * new users should not use them.
- */
-extern void show_differences(const struct cache_entry *ce, int reverse);
-extern void show_diff_empty(const struct cache_entry *ce, int reverse);
+extern void diff_addremove(int addremove,
+			   unsigned mode,
+			   const unsigned char *sha1,
+			   const char *base,
+			   const char *path);
+
+extern void diff_change(unsigned mode1, unsigned mode2,
+			     const unsigned char *sha1,
+			     const unsigned char *sha2,
+			     const char *base, const char *path);
+
+extern void diff_unmerge(const char *path);
+
+extern int diff_scoreopt_parse(const char *opt);
 
-struct diff_spec {
-	union {
-		const char *name;       /* path on the filesystem */
-		unsigned char sha1[20]; /* blob object ID */
-	} u;
-	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use u.sha1 and trust mode.
-				  * (however with a NULL SHA1, read them
-				  * from the file!).
-				  * if false, use u.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 */