diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-04-28 22:20:58 +0800 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-04-28 16:20:58 +0200 |
| commit | 91d64656a46848f1dceacbdf7f03677cd83d5aa0 (patch) | |
| tree | 68818af318d82122a62fd81312e6bc59e015c60f /vendor | |
| parent | 18f46fd7cfd5068adcb900828e814d415cb235a5 (diff) | |
| download | gitea-91d64656a46848f1dceacbdf7f03677cd83d5aa0.tar.gz gitea-91d64656a46848f1dceacbdf7f03677cd83d5aa0.zip | |
update git which fixes #1133 (#1614)
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/code.gitea.io/git/git.go | 13 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/vendor/code.gitea.io/git/git.go b/vendor/code.gitea.io/git/git.go index 2cea1dc1d5..9ec20c97e1 100644 --- a/vendor/code.gitea.io/git/git.go +++ b/vendor/code.gitea.io/git/git.go @@ -1,4 +1,5 @@ // Copyright 2015 The Gogs Authors. All rights reserved. +// Copyright 2017 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -8,6 +9,8 @@ import ( "fmt" "strings" "time" + + "github.com/mcuadros/go-version" ) // Version return this package's current version @@ -21,6 +24,8 @@ var ( Debug = false // Prefix the log prefix Prefix = "[git-module] " + // GitVersionRequired is the minimum Git version required + GitVersionRequired = "1.8.1.6" ) func log(format string, args ...interface{}) { @@ -66,7 +71,13 @@ func BinVersion() (string, error) { } func init() { - BinVersion() + gitVersion, err := BinVersion() + if err != nil { + panic(fmt.Sprintf("Git version missing: %v", err)) + } + if version.Compare(gitVersion, GitVersionRequired, "<") { + panic(fmt.Sprintf("Git version not supported. Requires version > %v", GitVersionRequired)) + } } // Fsck verifies the connectivity and validity of the objects in the database diff --git a/vendor/vendor.json b/vendor/vendor.json index b1934818a1..bd809fc7d2 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test", "package": [ { - "checksumSHA1": "vPnpECwoEpT/TTJn8CINm2cxV8s=", + "checksumSHA1": "spqE5xUEPQp8YV67McMTMAUIilY=", "path": "code.gitea.io/git", - "revision": "135704d70ee8dddec363e80f3235092493fea2c2", - "revisionTime": "2017-04-07T07:44:04Z" + "revision": "3f99247c0da807afc967c7e12b14f4109b7490ff", + "revisionTime": "2017-04-26T13:12:33Z" }, { "checksumSHA1": "xACJysFK1sK/D5655EpU48mw2vo=", |