diff options
| author | Vicent Marti <vicent@github.com> | 2014-05-09 08:59:59 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-05-09 08:59:59 +0200 |
| commit | e18d5e52e385c0cc2ad8d9d4fdd545517f170a11 (patch) | |
| tree | c529a250e7a234dde7194510e4a6c4692a79a92e /src/diff_file.c | |
| parent | 4df53a64a18aeea88a459183437cbd033cf4ca71 (diff) | |
| parent | bb45e39063669514b84ac5b47c3520cfe99396c3 (diff) | |
| download | libgit2-e18d5e52e385c0cc2ad8d9d4fdd545517f170a11.tar.gz | |
Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf
Add filter options and ALLOW_UNSAFE
Diffstat (limited to 'src/diff_file.c')
| -rw-r--r-- | src/diff_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff_file.c b/src/diff_file.c index b9f92df3f..f2a1d5099 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -300,7 +300,8 @@ static int diff_file_content_load_workdir_file( goto cleanup; if ((error = git_filter_list_load( - &fl, fc->repo, NULL, fc->file->path, GIT_FILTER_TO_ODB)) < 0) + &fl, fc->repo, NULL, fc->file->path, + GIT_FILTER_TO_ODB, GIT_FILTER_OPT_ALLOW_UNSAFE)) < 0) goto cleanup; /* if there are no filters, try to mmap the file */ |