diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-03-04 15:30:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 15:30:51 +0100 |
| commit | db522f11113a9ec240d8bd9c203687ddb4fd330c (patch) | |
| tree | 94d4bb6c6281d92fec6cd4753cd2db2131983dfd /worktree_status.go | |
| parent | af1e3817a80cccb560b25b0fd3343894754020ba (diff) | |
| parent | b2e0af997b79f45e99de4330473f110f01b68681 (diff) | |
| download | go-git-db522f11113a9ec240d8bd9c203687ddb4fd330c.tar.gz | |
Merge pull request #1070 from fbsb/fix/enable-excluded-patterns
worktree: allow manual ignore patterns when no .gitignore is available
Diffstat (limited to 'worktree_status.go')
| -rw-r--r-- | worktree_status.go | 6 |
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 |