Split the reference-filtering code into a separate file

Author: mhagger

git/git.go

@@ -290,76 +290,6 @@ func (l *BatchObjectIter) Close() error {
 	return err
 }
 
-type ReferenceFilter func(Reference) bool
-
-func AllReferencesFilter(_ Reference) bool {
-	return true
-}
-
-func PrefixFilter(prefix string) ReferenceFilter {
-	return func(r Reference) bool {
-		return strings.HasPrefix(r.Refname, prefix)
-	}
-}
-
-var (
-	BranchesFilter ReferenceFilter = PrefixFilter("refs/heads/")
-	TagsFilter     ReferenceFilter = PrefixFilter("refs/tags/")
-	RemotesFilter  ReferenceFilter = PrefixFilter("refs/remotes/")
-)
-
-func notNilFilters(filters ...ReferenceFilter) []ReferenceFilter {
-	var ret []ReferenceFilter
-	for _, filter := range filters {
-		if filter != nil {
-			ret = append(ret, filter)
-		}
-	}
-	return ret
-}
-
-func OrFilter(filters ...ReferenceFilter) ReferenceFilter {
-	filters = notNilFilters(filters...)
-	if len(filters) == 0 {
-		return AllReferencesFilter
-	} else if len(filters) == 1 {
-		return filters[0]
-	} else {
-		return func(r Reference) bool {
-			for _, filter := range filters {
-				if filter(r) {
-					return true
-				}
-			}
-			return false
-		}
-	}
-}
-
-func AndFilter(filters ...ReferenceFilter) ReferenceFilter {
-	filters = notNilFilters(filters...)
-	if len(filters) == 0 {
-		return AllReferencesFilter
-	} else if len(filters) == 1 {
-		return filters[0]
-	} else {
-		return func(r Reference) bool {
-			for _, filter := range filters {
-				if !filter(r) {
-					return false
-				}
-			}
-			return true
-		}
-	}
-}
-
-func NotFilter(filter ReferenceFilter) ReferenceFilter {
-	return func(r Reference) bool {
-		return !filter(r)
-	}
-}
-
 // Parse a `cat-file --batch[-check]` output header line (including
 // the trailing LF). `spec`, if not "", is used in error messages.
 func parseBatchHeader(spec string, header string) (OID, ObjectType, counts.Count32, error) {

git/ref_filter.go

@@ -0,0 +1,75 @@
+package git
+
+import (
+	"strings"
+)
+
+type ReferenceFilter func(Reference) bool
+
+func AllReferencesFilter(_ Reference) bool {
+	return true
+}
+
+func PrefixFilter(prefix string) ReferenceFilter {
+	return func(r Reference) bool {
+		return strings.HasPrefix(r.Refname, prefix)
+	}
+}
+
+var (
+	BranchesFilter ReferenceFilter = PrefixFilter("refs/heads/")
+	TagsFilter     ReferenceFilter = PrefixFilter("refs/tags/")
+	RemotesFilter  ReferenceFilter = PrefixFilter("refs/remotes/")
+)
+
+func notNilFilters(filters ...ReferenceFilter) []ReferenceFilter {
+	var ret []ReferenceFilter
+	for _, filter := range filters {
+		if filter != nil {
+			ret = append(ret, filter)
+		}
+	}
+	return ret
+}
+
+func OrFilter(filters ...ReferenceFilter) ReferenceFilter {
+	filters = notNilFilters(filters...)
+	if len(filters) == 0 {
+		return AllReferencesFilter
+	} else if len(filters) == 1 {
+		return filters[0]
+	} else {
+		return func(r Reference) bool {
+			for _, filter := range filters {
+				if filter(r) {
+					return true
+				}
+			}
+			return false
+		}
+	}
+}
+
+func AndFilter(filters ...ReferenceFilter) ReferenceFilter {
+	filters = notNilFilters(filters...)
+	if len(filters) == 0 {
+		return AllReferencesFilter
+	} else if len(filters) == 1 {
+		return filters[0]
+	} else {
+		return func(r Reference) bool {
+			for _, filter := range filters {
+				if !filter(r) {
+					return false
+				}
+			}
+			return true
+		}
+	}
+}
+
+func NotFilter(filter ReferenceFilter) ReferenceFilter {
+	return func(r Reference) bool {
+		return !filter(r)
+	}
+}