aboutsummaryrefslogtreecommitdiffstats
path: root/worktree_status.go
diff options
context:
space:
mode:
Diffstat (limited to 'worktree_status.go')
-rw-r--r--worktree_status.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/worktree_status.go b/worktree_status.go
index 0e113d0..16ce937 100644
--- 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