Merge branch 'maint-2.35' into maint-2.36

1 files changed, 12 insertions, 0 deletions

diff --git a/attr.h b/attr.h
index 3fb40cced0..2f22dffadb 100644
--- a/attr.h
+++ b/attr.h
@@ -107,6 +107,18 @@
  * - Free the `attr_check` struct by calling `attr_check_free()`.
  */
 
+/**
+ * The maximum line length for a gitattributes file. If the line exceeds this
+ * length we will ignore it.
+ */
+#define ATTR_MAX_LINE_LENGTH 2048
+
+ /**
+  * The maximum size of the giattributes file. If the file exceeds this size we
+  * will ignore it.
+  */
+#define ATTR_MAX_FILE_SIZE (100 * 1024 * 1024)
+
 struct index_state;
 
 /**