X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore.h;h=a38acb13e19e0b3bfe9a377fefe4810c9830a11e;hb=40a10462498bdd23d4e49f02867b8be50eb78704;hp=633d1ae5cf708cca4b907f0f032294f78d7bbe18;hpb=f4cedd483e5bc4b9553dbc40e084548f7f3bf2ab;p=git.git diff --git a/diffcore.h b/diffcore.h index 633d1ae5..a38acb13 100644 --- a/diffcore.h +++ b/diffcore.h @@ -43,7 +43,7 @@ extern void fill_filespec(struct diff_filespec *, const unsigned char *, unsigned short); extern int diff_populate_filespec(struct diff_filespec *, int); -extern void diff_free_filespec(struct diff_filespec *); +extern void diff_free_filespec_data(struct diff_filespec *); struct diff_filepair { struct diff_filespec *one; @@ -85,7 +85,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); extern void diffcore_pathspec(const char **pathspec); extern void diffcore_break(int); -extern void diffcore_rename(int rename_copy, int); +extern void diffcore_rename(struct diff_options *); extern void diffcore_merge_broken(void); extern void diffcore_pickaxe(const char *needle, int opts); extern void diffcore_order(const char *orderfile);