Sync with 'maint'

2 files changed, 13 insertions, 1 deletions

diff --git a/Documentation/fsck-msgids.txt b/Documentation/fsck-msgids.txt
index 7af76ff99a..12eae8a222 100644
--- a/Documentation/fsck-msgids.txt
+++ b/Documentation/fsck-msgids.txt
@@ -46,6 +46,18 @@
 `fullPathname`::
 	(WARN) A path contains the full path starting with "/".
 
+`gitattributesBlob`::
+	(ERROR) A non-blob found at `.gitattributes`.
+
+`gitattributesLarge`::
+	(ERROR) The `.gitattributes` blob is too large.
+
+`gitattributesLineLength`::
+	(ERROR) The `.gitattributes` blob contains too long lines.
+
+`gitattributesMissing`::
+	(ERROR) Unable to read `.gitattributes` blob.
+
 `gitattributesSymlink`::
 	(INFO) `.gitattributes` is a symlink.
 
diff --git a/attr.c b/attr.c
index b43e93ee96..9922529b58 100644
--- a/attr.c
+++ b/attr.c
@@ -752,7 +752,7 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
 	struct attr_stack *res;
 	char *buf, *sp;
 	int lineno = 0;
-	size_t size;
+	unsigned long size;
 
 	if (!istate)
 		return NULL;