From 798d9942c3625d88146d5e1c026afe6192acc98d Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Fri, 2 Feb 2024 13:55:42 +0100
Subject: plumbing: format/gitattributes, close file in ReadAttributesFile

Fixes #1017
---
 plumbing/format/gitattributes/attributes.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'plumbing/format/gitattributes/attributes.go')

diff --git a/plumbing/format/gitattributes/attributes.go b/plumbing/format/gitattributes/attributes.go
index d36ec1b..026d221 100644
--- a/plumbing/format/gitattributes/attributes.go
+++ b/plumbing/format/gitattributes/attributes.go
@@ -1,6 +1,7 @@
 package gitattributes
 
 import (
+	"bufio"
 	"errors"
 	"io"
 	"strings"
@@ -88,13 +89,10 @@ func (a attribute) String() string {
 
 // ReadAttributes reads patterns and attributes from the gitattributes format.
 func ReadAttributes(r io.Reader, domain []string, allowMacro bool) (attributes []MatchAttribute, err error) {
-	data, err := io.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
+	scanner := bufio.NewScanner(r)
 
-	for _, line := range strings.Split(string(data), eol) {
-		attribute, err := ParseAttributesLine(line, domain, allowMacro)
+	for scanner.Scan() {
+		attribute, err := ParseAttributesLine(scanner.Text(), domain, allowMacro)
 		if err != nil {
 			return attributes, err
 		}
@@ -105,6 +103,10 @@ func ReadAttributes(r io.Reader, domain []string, allowMacro bool) (attributes [
 		attributes = append(attributes, attribute)
 	}
 
+	if err := scanner.Err(); err != nil {
+		return attributes, err
+	}
+
 	return attributes, nil
 }
 
-- 
cgit