Merge branch 'ds/include-exclude'

diff --git a/convert.h b/convert.h
index 831559f10d4442b35a43c642b0fd6c203d996f3c..3710969d43d6a16c6eab2e8302f962aa466ccd9f 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -94,6 +94,12 @@ void convert_to_git_filter_fd(const struct index_state *istate,
 int would_convert_to_git_filter_fd(const struct index_state *istate,
                                   const char *path);
 
+/*
+ * Reset the internal list of attributes used by convert_to_git and
+ * convert_to_working_tree.
+ */
+void reset_parsed_attributes(void);
+
 /*****************************************************************
  *
  * Streaming conversion support