worktree: enable manual ignore patterns when no .gitignore is available

Signed-off-by: Fabian Sabau <[email protected]>
src-d · Feb 21, 2019 · 2ecc89d · 2ecc89d
1 parent db6c41c
commit 2ecc89d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/worktree_status.go b/worktree_status.go
@@ -142,12 +142,16 @@ func (w *Worktree) diffStagingWithWorktree(reverse bool) (merkletrie.Changes, er
 
 func (w *Worktree) excludeIgnoredChanges(changes merkletrie.Changes) merkletrie.Changes {
 	patterns, err := gitignore.ReadPatterns(w.Filesystem, nil)
-	if err != nil || len(patterns) == 0 {
+	if err != nil {
 		return changes
 	}
 
 	patterns = append(patterns, w.Excludes...)
 
+	if len(patterns) == 0 {
+		return changes
+	}
+
 	m := gitignore.NewMatcher(patterns)
 
 	var res merkletrie.Changes