go.mod: update gitobj to v1.4.1

Update gitobj to v1.4.1 and vendor in the new version.
This commit is contained in:
brian m. carlson 2019-09-10 18:18:27 +00:00
parent 7ffe2bde4a
commit f65985a1c9
No known key found for this signature in database
GPG Key ID: 2D0C9BC12F82B3A1
5 changed files with 23 additions and 5 deletions

2
go.mod

@ -2,7 +2,7 @@ module github.com/git-lfs/git-lfs
require ( require (
github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858 github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858
github.com/git-lfs/gitobj v1.4.0 github.com/git-lfs/gitobj v1.4.1
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066 github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066
github.com/git-lfs/wildmatch v1.0.2 github.com/git-lfs/wildmatch v1.0.2

4
go.sum

@ -2,8 +2,8 @@ github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858 h1:OZQyEhf4Bviyd
github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro= github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/git-lfs/gitobj v1.4.0 h1:F7fKUUM/OTVu0ejnBA6x0trSYM8A9Zv7VGoBTsMmhHk= github.com/git-lfs/gitobj v1.4.1 h1:6nH5d1QP7GJjZfBqaBXpS7mDzT4plXQLqUjPbcbtRpw=
github.com/git-lfs/gitobj v1.4.0/go.mod h1:EdPNGHVxXe1jTuNXzZT1+CdJCuASoDSLPQuvNOo9nGM= github.com/git-lfs/gitobj v1.4.1/go.mod h1:B+djgKTnUoJHbg4uDvnC/+6xPcfEJNFbZd/YunEJRtA=
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 h1:7Th0eBA4rT8WJNiM1vppjaIv9W5WJinhpbCJvRJxloI= github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 h1:7Th0eBA4rT8WJNiM1vppjaIv9W5WJinhpbCJvRJxloI=
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI= github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI=
github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066 h1:f5UyyCnv3o2EHy+zsqOyYa8jB5bZR/N9ZEideqeDYag= github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066 h1:f5UyyCnv3o2EHy+zsqOyYa8jB5bZR/N9ZEideqeDYag=

@ -5,3 +5,5 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2 github.com/stretchr/testify v1.2.2
) )
go 1.11

@ -6,6 +6,7 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
"strings"
"github.com/git-lfs/gitobj/errors" "github.com/git-lfs/gitobj/errors"
) )
@ -40,7 +41,7 @@ var (
func NewSet(db string) (*Set, error) { func NewSet(db string) (*Set, error) {
pd := filepath.Join(db, "pack") pd := filepath.Join(db, "pack")
paths, err := filepath.Glob(filepath.Join(pd, "*.pack")) paths, err := filepath.Glob(filepath.Join(escapeGlobPattern(pd), "*.pack"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -91,6 +92,21 @@ func NewSet(db string) (*Set, error) {
return NewSetPacks(packs...), nil return NewSetPacks(packs...), nil
} }
// globEscapes uses these escapes because filepath.Glob does not understand
// backslash escapes on Windows.
var globEscapes = map[string]string{
"*": "[*]",
"?": "[?]",
"[": "[[]",
}
func escapeGlobPattern(s string) string {
for char, escape := range globEscapes {
s = strings.Replace(s, char, escape, -1)
}
return s
}
// NewSetPacks creates a new *Set from the given packfiles. // NewSetPacks creates a new *Set from the given packfiles.
func NewSetPacks(packs ...*Packfile) *Set { func NewSetPacks(packs ...*Packfile) *Set {
m := make(map[byte][]*Packfile) m := make(map[byte][]*Packfile)

2
vendor/modules.txt vendored

@ -3,7 +3,7 @@ github.com/alexbrainman/sspi
github.com/alexbrainman/sspi/ntlm github.com/alexbrainman/sspi/ntlm
# github.com/davecgh/go-spew v1.1.1 # github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew github.com/davecgh/go-spew/spew
# github.com/git-lfs/gitobj v1.4.0 # github.com/git-lfs/gitobj v1.4.1
github.com/git-lfs/gitobj github.com/git-lfs/gitobj
github.com/git-lfs/gitobj/errors github.com/git-lfs/gitobj/errors
github.com/git-lfs/gitobj/pack github.com/git-lfs/gitobj/pack