From 98dbbae2efd5c232d94f5e4d8df9d388cace2ebc Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 May 2014 12:40:32 -0400 Subject: [PATCH] Fix #166 --- README.md | 2 +- README_ZH.md | 2 +- gogs.go | 2 +- models/git_diff.go | 2 ++ modules/middleware/repo.go | 1 - templates/repo/diff.tmpl | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a43be6f36f..e50af3526f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### Current version: 0.3.3 Alpha +##### Current version: 0.3.4 Alpha ### NOTICES diff --git a/README_ZH.md b/README_ZH.md index 05797b9634..928d43f78a 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。 ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### 当前版本:0.3.3 Alpha +##### 当前版本:0.3.4 Alpha ## 开发目的 diff --git a/gogs.go b/gogs.go index 912cd77788..2a18b4de9d 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/base" ) -const APP_VER = "0.3.3.0512 Alpha" +const APP_VER = "0.3.4.0513 Alpha" func init() { base.AppVer = APP_VER diff --git a/models/git_diff.go b/models/git_diff.go index cf93af6959..8dd5a8c882 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -49,6 +49,7 @@ type DiffSection struct { type DiffFile struct { Name string + Index int Addition, Deletion int Type int IsBin bool @@ -144,6 +145,7 @@ func ParsePatch(reader io.Reader) (*Diff, error) { curFile = &DiffFile{ Name: a[strings.Index(a, "/")+1:], + Index: len(diff.Files) + 1, Type: DIFF_FILE_CHANGE, Sections: make([]*DiffSection, 0, 10), } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 1bd1ea475d..bfb1e69da8 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -226,7 +226,6 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler { ctx.Data["IsBranch"] = ctx.Repo.IsBranch ctx.Data["IsCommit"] = ctx.Repo.IsCommit - log.Debug("Repo.Commit: %v", ctx.Repo.Commit) } log.Debug("displayBare: %v; IsBare: %v", displayBare, ctx.Repo.Repository.IsBare) diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 0b6d4f722e..c85caa21ec 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -51,14 +51,14 @@   - {{.Name}} + {{.Name}} {{end}} {{range .Diff.Files}} -
+
{{if not .IsBin}}