summaryrefslogtreecommitdiff
path: root/src/checkout.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2014-05-06 16:01:49 -0700
committerRussell Belfer <rb@github.com>2014-05-06 16:01:49 -0700
commit5269008cf632efcd6a16f6160ec44244ce442400 (patch)
treead3be5bcf12e9c046fab24fac3063e22b6843d5c /src/checkout.c
parent6e9afb97d14545f9cea292f581de89d610ae8c07 (diff)
downloadlibgit2-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/checkout.c')
-rw-r--r--src/checkout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c
index b869efe2b..20763fd35 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -1212,7 +1212,8 @@ static int blob_content_to_file(
if (!opts->disable_filters)
error = git_filter_list_load(
- &fl, git_blob_owner(blob), blob, hint_path, GIT_FILTER_TO_WORKTREE);
+ &fl, git_blob_owner(blob), blob, hint_path,
+ GIT_FILTER_TO_WORKTREE, GIT_FILTER_OPT_DEFAULT);
if (!error)
error = git_filter_list_apply_to_blob(&out, fl, blob);