diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:33 -0800 |
| commit | cde555480b95c4311819dc1f7a38cc856a9aed23 (patch) | |
| tree | afa74222656ad1c41fd10e48a7c8d40f484b87b2 /combine-diff.c | |
| parent | 3b2f8a02fa9a9e68d5215828e1d97bb4f6996976 (diff) | |
| parent | 36e7ed69de2c07a0214e79bde45714b92ac30ff2 (diff) | |
| download | git-cde555480b95c4311819dc1f7a38cc856a9aed23.tar.gz | |
Merge branch 'nd/the-index'
More codepaths become aware of working with in-core repository
instance other than the default "the_repository".
* nd/the-index: (22 commits)
rebase-interactive.c: remove the_repository references
rerere.c: remove the_repository references
pack-*.c: remove the_repository references
pack-check.c: remove the_repository references
notes-cache.c: remove the_repository references
line-log.c: remove the_repository reference
diff-lib.c: remove the_repository references
delta-islands.c: remove the_repository references
cache-tree.c: remove the_repository references
bundle.c: remove the_repository references
branch.c: remove the_repository reference
bisect.c: remove the_repository reference
blame.c: remove implicit dependency the_repository
sequencer.c: remove implicit dependency on the_repository
sequencer.c: remove implicit dependency on the_index
transport.c: remove implicit dependency on the_index
notes-merge.c: remove implicit dependency the_repository
notes-merge.c: remove implicit dependency on the_index
list-objects.c: reduce the_repository references
list-objects-filter.c: remove implicit dependency on the_index
...
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 ad7752ea6b..a143c00634 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -996,7 +996,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) |