github/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-09-10 13:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

update go git from v4.10.0 to v4.11.0 (#7096)

Browse Source
This commit is contained in:
Lunny Xiao
2019-06-01 03:34:46 +08:00
committed by zeripath
parent fb4438a815
commit 8a343dda39
15 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/gopkg.in/src-d/go-git.v4/worktree_status.go generated vendored
View File

@@ -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