diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | bd7ad45b64bf8b5a5256bd1eeb3907f8516244a8 (patch) | |
| tree | cdd5fe9c0cf00859fc627d7c0f2bfa28885c8bf3 /combine-diff.c | |
| parent | 363df5572c3068d294d66c61025b377712e957c9 (diff) | |
| download | git-bd7ad45b64bf8b5a5256bd1eeb3907f8516244a8.tar.gz | |
notes-cache.c: remove the_repository references
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 10155e0ec8..3d796af3ca 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -991,7 +991,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, if (!userdiff) userdiff = userdiff_find_by_name("default"); if (opt->flags.allow_textconv) - textconv = userdiff_get_textconv(userdiff); + textconv = userdiff_get_textconv(opt->repo, userdiff); /* Read the result of merge first */ if (!working_tree_file) |