diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-28 10:41:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-15 15:38:29 -0800 |
| commit | 0aa9d8aa6ce429f0fa04e1ca819ed766c211e242 (patch) | |
| tree | a1300182f22bf55f45b5769673cabc6535666dd7 /userdiff.c | |
| parent | Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth (diff) | |
| parent | rebase-interactive.c: remove the_repository references (diff) | |
| download | git-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.tar.gz git-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.zip | |
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/userdiff.c b/userdiff.c index 46d34cc2a4..97007abe5b 100644 --- a/userdiff.c +++ b/userdiff.c @@ -290,7 +290,8 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate, return userdiff_find_by_name(check->items[0].value); } -struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver) +struct userdiff_driver *userdiff_get_textconv(struct repository *r, + struct userdiff_driver *driver) { if (!driver->textconv) return NULL; @@ -300,7 +301,7 @@ struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver) struct strbuf name = STRBUF_INIT; strbuf_addf(&name, "textconv/%s", driver->name); - notes_cache_init(c, name.buf, driver->textconv); + notes_cache_init(r, c, name.buf, driver->textconv); driver->textconv_cache = c; strbuf_release(&name); } |