worldcone/forgejo
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update git which fixes #1133 (#1614)

Browse source
This commit is contained in:
Lunny Xiao 2017-04-28 22:20:58 +08:00 committed by Kim "BKC" Carlbäcker
parent 18f46fd7cf
commit 91d64656a4
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
vendor/code.gitea.io/git/git.go generated vendored
View file

@ -1,4 +1,5 @@
// Copyright 2015 The Gogs Authors. All rights reserved. // 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 // Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -8,6 +9,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"time" "time"
"github.com/mcuadros/go-version"
) )
// Version return this package's current version // Version return this package's current version
@ -21,6 +24,8 @@ var (
Debug = false Debug = false
// Prefix the log prefix // Prefix the log prefix
Prefix = "[git-module] " Prefix = "[git-module] "
// GitVersionRequired is the minimum Git version required
GitVersionRequired = "1.8.1.6"
) )
func log(format string, args ...interface{}) { func log(format string, args ...interface{}) {
@ -66,7 +71,13 @@ func BinVersion() (string, error) {
} }
func init() { 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 // Fsck verifies the connectivity and validity of the objects in the database

6
vendor/vendor.json vendored
View file

@ -3,10 +3,10 @@
"ignore": "test", "ignore": "test",
"package": [ "package": [
{ {
"checksumSHA1": "vPnpECwoEpT/TTJn8CINm2cxV8s=", "checksumSHA1": "spqE5xUEPQp8YV67McMTMAUIilY=",
"path": "code.gitea.io/git", "path": "code.gitea.io/git",
"revision": "135704d70ee8dddec363e80f3235092493fea2c2", "revision": "3f99247c0da807afc967c7e12b14f4109b7490ff",
"revisionTime": "2017-04-07T07:44:04Z" "revisionTime": "2017-04-26T13:12:33Z"
}, },
{ {
"checksumSHA1": "xACJysFK1sK/D5655EpU48mw2vo=", "checksumSHA1": "xACJysFK1sK/D5655EpU48mw2vo=",