unpack-trees.c: look ahead in the index

diff --git a/diff.h b/diff.h
index 2740421cfe9985a57f61855dc6372e8402231e0e..471f606a926242ab48957746dcc33f7ff0a41418 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -130,6 +130,7 @@ enum color_diff {
        DIFF_FILE_NEW = 5,
        DIFF_COMMIT = 6,
        DIFF_WHITESPACE = 7,
+       DIFF_FUNCINFO = 8,
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \
@@ -207,6 +208,7 @@ extern int diff_setup_done(struct diff_options *);
 #define DIFF_PICKAXE_REGEX     2
 
 extern void diffcore_std(struct diff_options *);
+extern void diffcore_fix_diff_index(struct diff_options *);
 
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \