strmap: enable allocations to come from a mem_pool

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index e0c0af6286bbab24fde5174282c66a122737c392..11de52e9e9b0cc67704b56d6579970c95bc28cd7 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -287,8 +287,6 @@ struct diff_options {
 
        /* If non-zero, then stop computing after this many changes. */
        int max_changes;
-       /* For internal use only. */
-       int num_changes;
 
        int ita_invisible_in_index;
 /* white-space error highlighting */
@@ -454,11 +452,11 @@ struct combine_diff_path {
                st_mult(sizeof(struct combine_diff_parent), (n)))
 
 void show_combined_diff(struct combine_diff_path *elem, int num_parent,
-                       int dense, struct rev_info *);
+                       struct rev_info *);
 
-void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
+void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
 
-void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
+void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
 
 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 
@@ -600,6 +598,13 @@ int index_differs_from(struct repository *r, const char *def,
                       const struct diff_flags *flags,
                       int ita_invisible_in_index);
 
+/*
+ * Emit an interdiff of two object ID's to 'diff_options.file' optionally
+ * indented by 'indent' spaces.
+ */
+void show_interdiff(const struct object_id *, const struct object_id *,
+                   int indent, struct diff_options *);
+
 /*
  * Fill the contents of the filespec "df", respecting any textconv defined by
  * its userdiff driver.  The "driver" parameter must come from a