From 79dcd7ee6e0c3bb576cf5d0ece583156c4466b95 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 13 Dec 2015 18:20:39 -0500 Subject: [PATCH] #2167 able to identify git version on Windows --- README.md | 2 +- cmd/web.go | 2 +- gogs.go | 2 +- models/repo.go | 2 +- routers/repo/repo.go | 3 ++- templates/.VERSION | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ef23ff318a..d151b5cf50 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current version: 0.8.0 +##### Current version: 0.8.1 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/cmd/web.go b/cmd/web.go index 13d7660c76..107250844a 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.1.0"}, + {"github.com/gogits/git-shell", git.Version, "0.1.1"}, } for _, c := range checkers { if !version.Compare(c.Version(), c.Expected, ">=") { diff --git a/gogs.go b/gogs.go index 7704ed777e..a9835cf156 100644 --- a/gogs.go +++ b/gogs.go @@ -18,7 +18,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.0.1212" +const APP_VER = "0.8.1.1213" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/repo.go b/models/repo.go index b67331d004..76e381600e 100644 --- a/models/repo.go +++ b/models/repo.go @@ -27,7 +27,7 @@ import ( "github.com/mcuadros/go-version" "gopkg.in/ini.v1" - "github.com/gogits/git-shell" + git "github.com/gogits/git-shell" api "github.com/gogits/go-gogs-client" "github.com/gogits/gogs/modules/base" diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 3cd06eba9f..c1f2a0f1e8 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -278,6 +278,7 @@ func Download(ctx *middleware.Context) { archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz") archiveType = git.TARGZ default: + log.Trace("Unknown format: %s", uri) ctx.Error(404) return } @@ -315,7 +316,7 @@ func Download(ctx *middleware.Context) { return } } else { - ctx.Error(404) + ctx.Handle(404, "Download", nil) return } diff --git a/templates/.VERSION b/templates/.VERSION index ec9d7eef93..945200b36f 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.0.1212 \ No newline at end of file +0.8.1.1213 \ No newline at end of file