Merge branch 'feature/disabled-filters-checkout' into libgit-next-1.7.2

Author: zawata

include/git2/checkout.h

@@ -342,6 +342,7 @@ typedef struct git_checkout_options {
 
 	/** Payload passed to perfdata_cb */
 	void *perfdata_payload;
+	git_strarray disabled_filters;
 } git_checkout_options;
 
 #define GIT_CHECKOUT_OPTIONS_VERSION 1

src/libgit2/checkout.c

@@ -1568,6 +1568,7 @@ static int blob_content_to_file(
 
 	filter_session.attr_session = &data->attr_session;
 	filter_session.temp_buf = &buffers->tmp;
+	filter_session.disabled_filters = &data->opts.disabled_filters;
 
 	if (!data->opts.disable_filters) {
 		git_mutex_lock(&data->index_mutex);
@@ -2429,6 +2430,7 @@ static int checkout_write_merge(
 
 		filter_session.attr_session = &data->attr_session;
 		filter_session.temp_buf = &buffers->tmp;
+		filter_session.disabled_filters = &data->opts.disabled_filters;
 
 		if ((error = git_filter_list__load(
 				&fl, data->repo, NULL, result.path,

src/libgit2/filter.c

@@ -516,6 +516,8 @@ int git_filter_list__load(
 	git_filter_session *filter_session)
 {
 	int error = 0;
+	int i;
+	int disabled_filter_found;
 	git_filter_list *fl = NULL;
 	git_filter_source src = { 0 };
 	git_filter_entry *fe;
@@ -543,6 +545,19 @@ int git_filter_list__load(
 		if (!fdef || !fdef->filter)
 			continue;
 
+		if (filter_session->disabled_filters) {
+			disabled_filter_found = 0;
+			for (i = 0; i < filter_session->disabled_filters->count; ++i) {
+				char *filter = filter_session->disabled_filters->strings[i];
+				if (!strcmp(filter, fdef->filter_name)) {
+					disabled_filter_found = 1;
+					break;
+				}
+			}
+			if (disabled_filter_found)
+				continue;
+		}
+
 		if (fdef->nattrs > 0) {
 			error = filter_list_check_attributes(
 				&values, repo,

src/libgit2/filter.h

@@ -20,6 +20,7 @@ typedef struct {
 	git_filter_options options;
 	git_attr_session *attr_session;
 	git_str *temp_buf;
+	git_strarray *disabled_filters;
 } git_filter_session;
 
 #define GIT_FILTER_SESSION_INIT {GIT_FILTER_OPTIONS_INIT, 0}