瀏覽代碼

Do not return nil pointers when loading ignores (fixes #846)

Not sure, perhaps we should check for error, and respect that instead.
But then in the walker we'll have to check for a nil pointer anyway.
Audrius Butkevicius 11 年之前
父節點
當前提交
31d95ac9e6
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      internal/ignore/ignore.go

+ 3 - 3
internal/ignore/ignore.go

@@ -120,13 +120,13 @@ func (m *Matcher) Match(file string) (result bool) {
 
 func loadIgnoreFile(file string, seen map[string]bool) (*Matcher, error) {
 	if seen[file] {
-		return nil, fmt.Errorf("Multiple include of ignore file %q", file)
+		return &Matcher{}, fmt.Errorf("Multiple include of ignore file %q", file)
 	}
 	seen[file] = true
 
 	fd, err := os.Open(file)
 	if err != nil {
-		return nil, err
+		return &Matcher{}, err
 	}
 	defer fd.Close()
 
@@ -134,7 +134,7 @@ func loadIgnoreFile(file string, seen map[string]bool) (*Matcher, error) {
 }
 
 func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) (*Matcher, error) {
-	var exps Matcher
+	exps := Matcher{}
 
 	addPattern := func(line string) error {
 		include := true