core-tutorial: adjust to recent reality.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 9a0169c..ff41c58 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -13,6 +13,9 @@ struct tree_desc {
        unsigned long size;
 };
 
+extern void update_tree_entry(struct tree_desc *);
+extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+
 struct diff_options;
 
 typedef void (*change_fn_t)(struct diff_options *options,
@@ -65,9 +68,9 @@ struct combine_diff_path {
 };
 
 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-                      int dense, const char *header, int show_empty);
+                      int dense, const char *header);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
 
 extern void diff_addremove(struct diff_options *,
                           int addremove,