Browse Source

vendor: update github.com/gogits/git-module

pull/3742/merge
Unknwon 8 years ago
parent
commit
c07899701a
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 5
      models/repo.go
  2. 2
      vendor/github.com/gogits/git-module/README.md
  3. 5
      vendor/github.com/gogits/git-module/repo.go
  4. 6
      vendor/vendor.json

5
models/repo.go

@ -335,14 +335,9 @@ func (repo *Repository) mustOwner(e Engine) *User {
func (repo *Repository) UpdateSize() error { func (repo *Repository) UpdateSize() error {
countObject, err := git.GetRepoSize(repo.RepoPath()) countObject, err := git.GetRepoSize(repo.RepoPath())
if err != nil { if err != nil {
if !git.IsErrUnsupportedVersion(err) {
return fmt.Errorf("GetRepoSize: %v", err) return fmt.Errorf("GetRepoSize: %v", err)
} }
log.Warn("Get repository size is not supported by the Git version on server")
return nil
}
repo.Size = countObject.Size + countObject.SizePack repo.Size = countObject.Size + countObject.SizePack
if _, err = x.Id(repo.ID).Cols("size").Update(repo); err != nil { if _, err = x.Id(repo.ID).Cols("size").Update(repo); err != nil {
return fmt.Errorf("update size: %v", err) return fmt.Errorf("update size: %v", err)

2
vendor/github.com/gogits/git-module/README.md generated vendored

@ -5,7 +5,7 @@ Package git-module is a Go module for Git access through shell commands.
## Limitations ## Limitations
- Go version must be at least **1.4**. - Go version must be at least **1.4**.
- Git version must be no less than **1.7.1**, and greater than or equal to **1.8.0** is recommended. - Git version must be no less than **1.7.1**, and greater than or equal to **1.8.3** is recommended.
- For Windows users, try use as new a version as possible. - For Windows users, try use as new a version as possible.
## License ## License

5
vendor/github.com/gogits/git-module/repo.go generated vendored

@ -15,7 +15,6 @@ import (
"time" "time"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/mcuadros/go-version"
) )
// Repository represents a Git repository. // Repository represents a Git repository.
@ -249,10 +248,6 @@ const (
// GetRepoSize returns disk usage report of repository in given path. // GetRepoSize returns disk usage report of repository in given path.
func GetRepoSize(repoPath string) (*CountObject, error) { func GetRepoSize(repoPath string) (*CountObject, error) {
if version.Compare(gitVersion, "1.8.3", "<") {
return nil, ErrUnsupportedVersion{"1.8.3"}
}
cmd := NewCommand("count-objects", "-v") cmd := NewCommand("count-objects", "-v")
stdout, err := cmd.RunInDir(repoPath) stdout, err := cmd.RunInDir(repoPath)
if err != nil { if err != nil {

6
vendor/vendor.json vendored

@ -159,10 +159,10 @@
"revisionTime": "2016-08-10T03:50:02Z" "revisionTime": "2016-08-10T03:50:02Z"
}, },
{ {
"checksumSHA1": "b7QGk00tV65zoJ2LxNOv+/ShNb0=", "checksumSHA1": "WVDLV+YcA77fg1kgddSinycf3Do=",
"path": "github.com/gogits/git-module", "path": "github.com/gogits/git-module",
"revision": "187ba03b3c392ed6e6af3985f0bad0c2120219ca", "revision": "f4026b57acf35d799d5dec95066f3a10c572604e",
"revisionTime": "2017-04-01T21:46:49Z" "revisionTime": "2017-04-03T19:07:43Z"
}, },
{ {
"checksumSHA1": "D2kVXl0QpIw6t3891Sl7IM9wL+w=", "checksumSHA1": "D2kVXl0QpIw6t3891Sl7IM9wL+w=",

Loading…
Cancel
Save