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

diff --git a/diff.h b/diff.h
index 24df9089..0b76cc42 100644
--- a/diff.h
+++ b/diff.h
@@ -4,22 +4,28 @@
 #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);
+
+/* These are for diff-tree-helper */
 
 struct diff_spec {
-	union {
-		const char *name;       /* path on the filesystem */
-		unsigned char sha1[20]; /* blob object ID */
-	} u;
+	unsigned char blob_sha1[20];
 	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
+	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 */