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/blob.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/blob.c')
| -rw-r--r-- | src/blob.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/blob.c b/src/blob.c index 0aa2516db..ab7dec67f 100644 --- a/src/blob.c +++ b/src/blob.c @@ -198,7 +198,8 @@ int git_blob__create_from_paths( if (try_load_filters) /* Load the filters for writing this file to the ODB */ error = git_filter_list_load( - &fl, repo, NULL, hint_path, GIT_FILTER_TO_ODB); + &fl, repo, NULL, hint_path, + GIT_FILTER_TO_ODB, GIT_FILTER_OPT_DEFAULT); if (error < 0) /* well, that didn't work */; @@ -356,7 +357,8 @@ int git_blob_filtered_content( return 0; if (!(error = git_filter_list_load( - &fl, git_blob_owner(blob), blob, path, GIT_FILTER_TO_WORKTREE))) { + &fl, git_blob_owner(blob), blob, path, + GIT_FILTER_TO_WORKTREE, GIT_FILTER_OPT_DEFAULT))) { error = git_filter_list_apply_to_blob(out, fl, blob); |