diff options
| author | Brian Lopez <seniorlopez@gmail.com> | 2018-01-10 19:19:34 -0800 |
|---|---|---|
| committer | Brian Lopez <seniorlopez@gmail.com> | 2018-01-10 19:19:34 -0800 |
| commit | 5734768b9edaecedaa7b13fed2ce59cb588df7e8 (patch) | |
| tree | 84a845211a548cef770bbccd32d6d041a2bcea2b /src/diff_file.c | |
| parent | f4f0e7eb0f8280ed6100c37c3af0aa66c31a8f9e (diff) | |
| parent | f1323d9c161aeeada190fd9615a8b5a9fb8a7f3e (diff) | |
| download | libgit2-5734768b9edaecedaa7b13fed2ce59cb588df7e8.tar.gz | |
Merge remote-tracking branch 'origin/master' into charliesome/trailer-info
Diffstat (limited to 'src/diff_file.c')
| -rw-r--r-- | src/diff_file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/diff_file.c b/src/diff_file.c index 0813315f5..5bb9c372a 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -54,7 +54,8 @@ static int diff_file_content_init_common( fc->src = GIT_ITERATOR_TYPE_TREE; if (!fc->driver && - git_diff_driver_lookup(&fc->driver, fc->repo, fc->file->path) < 0) + git_diff_driver_lookup(&fc->driver, fc->repo, + NULL, fc->file->path) < 0) return -1; /* give driver a chance to modify options */ @@ -101,7 +102,8 @@ int git_diff_file_content__init_from_diff( fc->file = use_old ? &delta->old_file : &delta->new_file; fc->src = use_old ? diff->old_src : diff->new_src; - if (git_diff_driver_lookup(&fc->driver, fc->repo, fc->file->path) < 0) + if (git_diff_driver_lookup(&fc->driver, fc->repo, + &diff->attrsession, fc->file->path) < 0) return -1; switch (delta->status) { |