Fixes gitignore ignored on checkout

Oleg Sklyar · Oleg Sklyar · commit dcdd9a70179b · 2017-06-20T17:18:59.000+02:00
diff --git a/worktree_status.go b/worktree_status.go
@@ -68,8 +68,6 @@ func (w *Worktree) status(commit plumbing.Hash) (Status, error) {
 		return nil, err
 	}
 
-	right = w.excludeIgnoredChanges(right)
-
 	for _, ch := range right {
 		a, err := ch.Action()
 		if err != nil {
@@ -117,7 +115,11 @@ func (w *Worktree) diffStagingWithWorktree() (merkletrie.Changes, error) {
 	}
 
 	to := filesystem.NewRootNode(w.fs, submodules)
-	return merkletrie.DiffTree(from, to, diffTreeIsEquals)
+	res, err := merkletrie.DiffTree(from, to, diffTreeIsEquals)
+	if err == nil {
+		res = w.excludeIgnoredChanges(res)
+	}
+	return res, err
 }
 
 func (w *Worktree) excludeIgnoredChanges(changes merkletrie.Changes) merkletrie.Changes {

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ func (w *Worktree) status(commit plumbing.Hash) (Status, error) {`
`68`	`68`	`return nil, err`
`69`	`69`	`}`
`70`	`70`
`71`		`- right = w.excludeIgnoredChanges(right)`
`72`		`-`
`73`	`71`	`for _, ch := range right {`
`74`	`72`	`a, err := ch.Action()`
`75`	`73`	`if err != nil {`
`@@ -117,7 +115,11 @@ func (w *Worktree) diffStagingWithWorktree() (merkletrie.Changes, error) {`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`to := filesystem.NewRootNode(w.fs, submodules)`
`120`		`- return merkletrie.DiffTree(from, to, diffTreeIsEquals)`
	`118`	`+ res, err := merkletrie.DiffTree(from, to, diffTreeIsEquals)`
	`119`	`+ if err == nil {`
	`120`	`+ res = w.excludeIgnoredChanges(res)`
	`121`	`+ }`
	`122`	`+ return res, err`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`func (w *Worktree) excludeIgnoredChanges(changes merkletrie.Changes) merkletrie.Changes {`