diff options
author | Russell Belfer <rb@github.com> | 2014-05-06 16:01:49 -0700 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2014-05-06 16:01:49 -0700 |
commit | 5269008cf632efcd6a16f6160ec44244ce442400 (patch) | |
tree | ad3be5bcf12e9c046fab24fac3063e22b6843d5c /src/diff_file.c | |
parent | 6e9afb97d14545f9cea292f581de89d610ae8c07 (diff) | |
download | libgit2-5269008cf632efcd6a16f6160ec44244ce442400.tar.gz |
Add filter options and ALLOW_UNSAFE
Diff and status do not want core.safecrlf to actually raise an
error regardless of the setting, so this extends the filter API
with an additional options flags parameter and adds a flag so that
filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating
that unsafe filter application should be downgraded from a failure
to a warning.
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 */ |