Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 43 insertions, 0 deletions

diff --git a/modules/git/version.go b/modules/git/version.go
new file mode 100644
index 0000000000..683e859b47
--- /dev/null
+++ b/modules/git/version.go
@@ -0,0 +1,43 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+	"errors"
+	"strings"
+
+	"github.com/Unknwon/com"
+)
+
+// Version represents version of Git.
+type Version struct {
+	Major, Minor, Patch int
+}
+
+// GetVersion returns current Git version installed.
+func GetVersion() (Version, error) {
+	stdout, stderr, err := com.ExecCmd("git", "version")
+	if err != nil {
+		return Version{}, errors.New(stderr)
+	}
+
+	infos := strings.Split(stdout, " ")
+	if len(infos) < 3 {
+		return Version{}, errors.New("not enough output")
+	}
+
+	v := Version{}
+	for i, s := range strings.Split(strings.TrimSpace(infos[2]), ".") {
+		switch i {
+		case 0:
+			v.Major, _ = com.StrTo(s).Int()
+		case 1:
+			v.Minor, _ = com.StrTo(s).Int()
+		case 2:
+			v.Patch, _ = com.StrTo(s).Int()
+		}
+	}
+	return v, nil
+}