diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | cmd/web.go | 2 | ||||
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/git_diff.go | 2 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
5 files changed, 6 insertions, 4 deletions
@@ -3,7 +3,7 @@ Gogs - Go Git Service [ -##### Current version: 0.8.3 +##### Current version: 0.8.4 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/cmd/web.go b/cmd/web.go index aec091e453..87fe1b6a77 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -88,7 +88,7 @@ func checkVersion() { {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/macaron.v1", macaron.Version, "0.8.0"}, - {"github.com/gogits/git-shell", git.Version, "0.2.0"}, + {"github.com/gogits/git-shell", git.Version, "0.2.1"}, } for _, c := range checkers { if !version.Compare(c.Version(), c.Expected, ">=") { @@ -18,7 +18,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.3.1214" +const APP_VER = "0.8.4.1214" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/git_diff.go b/models/git_diff.go index 725806699e..2113250451 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -9,6 +9,7 @@ import ( "bytes" "fmt" "io" + "io/ioutil" "os" "os/exec" "strings" @@ -124,6 +125,7 @@ func ParsePatch(maxlines int, reader io.Reader) (*Diff, error) { // Diff data too large, we only show the first about maxlines lines if lineCount >= maxlines { log.Warn("Diff data too large") + io.Copy(ioutil.Discard, reader) diff.Files = nil return diff, nil } diff --git a/templates/.VERSION b/templates/.VERSION index 32086d73d3..6e4805316a 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.3.1214
\ No newline at end of file +0.8.4.1214
\ No newline at end of file |