Merge branch 'maint'

diff --git a/diffcore.h b/diffcore.h
index 05985147ea99ce54069163cd8c1372b7bb971c93..eb618b1ec00113dabcd5231f141f82e1cdfdca46 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -27,7 +27,7 @@ struct diff_filespec {
        char *path;
        void *data;
        void *cnt_data;
-       const void *hunk_header_ident;
+       const char *funcname_pattern_ident;
        unsigned long size;
        int xfrm_flags;          /* for use by the xfrm */
        unsigned short mode;     /* file mode */
@@ -48,6 +48,7 @@ extern void fill_filespec(struct diff_filespec *, const unsigned char *,
 
 extern int diff_populate_filespec(struct diff_filespec *, int);
 extern void diff_free_filespec_data(struct diff_filespec *);
+extern void diff_free_filespec_blob(struct diff_filespec *);
 extern int diff_filespec_is_binary(struct diff_filespec *);
 
 struct diff_filepair {