combine-diff: cleanup.

diff --git a/diff.h b/diff.h
index 539bd2f5ce98b779885b9a3fdc2e838b5b293d6b..32134d79b5942b21ef55549801f91b31d980e948 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,
@@ -101,9 +104,6 @@ extern int diff_setup_done(struct diff_options *);
 
 #define DIFF_PICKAXE_ALL       1
 
-#define DIFF_DEFAULT_INDEX_ABBREV      7 /* hex digits */
-#define DIFF_DEFAULT_ABBREV    7 /* hex digits */
-
 extern void diffcore_std(struct diff_options *);
 
 extern void diffcore_std_no_resolve(struct diff_options *);