Make update-cache be explicit about failed open() when doing

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 24df908..0b76cc4 100644 (file)
--- 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 */