From b3ac33cbcfba182c037e1c8c393f7536e5b7445d Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sat, 1 Apr 2017 17:50:11 -0400
Subject: vendor: update github.com/gogits/git-module
---
vendor/github.com/gogits/git-module/repo.go | 7 ++++++-
vendor/vendor.json | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/vendor/github.com/gogits/git-module/repo.go b/vendor/github.com/gogits/git-module/repo.go
index 7a8e872b..02f264c1 100644
--- a/vendor/github.com/gogits/git-module/repo.go
+++ b/vendor/github.com/gogits/git-module/repo.go
@@ -15,6 +15,7 @@ import (
"time"
"github.com/Unknwon/com"
+ "github.com/mcuadros/go-version"
)
// Repository represents a Git repository.
@@ -248,6 +249,10 @@ const (
// GetRepoSize returns disk usage report of repository in given path.
func GetRepoSize(repoPath string) (*CountObject, error) {
+ if version.Compare(gitVersion, "1.8.3", "<") {
+ return nil, ErrUnsupportedVersion{"1.8.3"}
+ }
+
cmd := NewCommand("count-objects", "-v")
stdout, err := cmd.RunInDir(repoPath)
if err != nil {
@@ -262,7 +267,7 @@ func GetRepoSize(repoPath string) (*CountObject, error) {
case strings.HasPrefix(line, _STAT_SIZE):
countObject.Size = com.StrTo(line[6:]).MustInt64() * 1024
case strings.HasPrefix(line, _STAT_IN_PACK):
- countObject.InPack = com.StrTo(line[9:]).MustInt64() * 1024
+ countObject.InPack = com.StrTo(line[9:]).MustInt64()
case strings.HasPrefix(line, _STAT_PACKS):
countObject.Packs = com.StrTo(line[7:]).MustInt64()
case strings.HasPrefix(line, _STAT_SIZE_PACK):
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 6ca76a70..54047ebe 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -159,10 +159,10 @@
"revisionTime": "2016-08-10T03:50:02Z"
},
{
- "checksumSHA1": "0BVytmK2I0QObcFqVyVWWU544DA=",
+ "checksumSHA1": "b7QGk00tV65zoJ2LxNOv+/ShNb0=",
"path": "github.com/gogits/git-module",
- "revision": "e0ab95e3e61573e88bb808ae8052fd669324d80f",
- "revisionTime": "2017-03-17T02:27:16Z"
+ "revision": "187ba03b3c392ed6e6af3985f0bad0c2120219ca",
+ "revisionTime": "2017-04-01T21:46:49Z"
},
{
"checksumSHA1": "D2kVXl0QpIw6t3891Sl7IM9wL+w=",
--
cgit v1.2.3