aboutsummaryrefslogtreecommitdiffstats
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-12-28 10:41:41 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-15 15:38:29 -0800
commit0aa9d8aa6ce429f0fa04e1ca819ed766c211e242 (patch)
treea1300182f22bf55f45b5769673cabc6535666dd7 /userdiff.h
parentMerge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth (diff)
parentrebase-interactive.c: remove the_repository references (diff)
downloadgit-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.tar.gz
git-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.zip
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
Diffstat (limited to 'userdiff.h')
-rw-r--r--userdiff.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/userdiff.h b/userdiff.h
index b072bfe89a..203057e13e 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -4,6 +4,7 @@
#include "notes-cache.h"
struct index_state;
+struct repository;
struct userdiff_funcname {
const char *pattern;
@@ -30,6 +31,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
* Initialize any textconv-related fields in the driver and return it, or NULL
* if it does not have textconv enabled at all.
*/
-struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
+struct userdiff_driver *userdiff_get_textconv(struct repository *r,
+ struct userdiff_driver *driver);
#endif /* USERDIFF */